gered/clj-browserchannel
Archived
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove unnecessary to-confirm-array-ids

Browse source
This commit is contained in:
Vassil Dichev 2012-05-19 09:45:58 +03:00 committed by Gijs Stuurman
parent 98ebebf95e
commit a862e74f91
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
clj-browserchannel-server/src/net/thegeez/browserchannel.clj
View file

@ -274,11 +274,7 @@
;; [[id_lowest, data] .. [id_highest, data]] ;; [[id_lowest, data] .. [id_highest, data]]
array-buffer array-buffer
;; send out array ids waiting to be acknowledged ;; last flushed array id
to-confirm-array-ids
;; needed to be kept, to resume counting when both
;; array-buffer and to-confirm-array-ids are empty
last-sent-array-id last-sent-array-id
;; ScheduleTask or nil ;; ScheduleTask or nil
@ -359,9 +355,7 @@
(-> this (-> this
(update-in [:array-buffer] conj [next-array-id string]) (update-in [:array-buffer] conj [next-array-id string])
(assoc :last-sent-array-id next-array-id)))) (assoc :last-sent-array-id next-array-id))))
(acknowledge-arrays [this array-id] (acknowledge-arrays [this array-id])
(update-in this [:to-confirm-array-ids]
drop-queue (Long/parseLong array-id)))
;; tries to do the actual writing to the client ;; tries to do the actual writing to the client
;; @todo the composition is a bit awkward in this method due to the ;; @todo the composition is a bit awkward in this method due to the
;; try catch and if mix ;; try catch and if mix
@ -382,7 +376,6 @@
(-> this (-> this
(assoc :array-buffer clojure.lang.PersistentQueue/EMPTY) (assoc :array-buffer clojure.lang.PersistentQueue/EMPTY)
(assoc :last-sent-array-id (first (last buffer))) (assoc :last-sent-array-id (first (last buffer)))
(update-in [:to-confirm-array-ids] into (map first buffer))
(update-in [:back-channel :bytes-sent] + size))) (update-in [:back-channel :bytes-sent] + size)))
;; clear-back-channel closes the back ;; clear-back-channel closes the back
;; channel when the channel does not ;; channel when the channel does not
@ -440,7 +433,6 @@
details details
nil ;; backchannel nil ;; backchannel
clojure.lang.PersistentQueue/EMPTY ;; array-buffer clojure.lang.PersistentQueue/EMPTY ;; array-buffer
clojure.lang.PersistentQueue/EMPTY ;; sent out array ids
0 ;; last-sent-array-id, the array 0 ;; last-sent-array-id, the array
;; with id 0 will be sent as an answer to ;; with id 0 will be sent as an answer to
;; the first forward-channel POST ;; the first forward-channel POST