Changes In Branch defunct-try-of-non-blocking-receive Excluding Merge-Ins
This is equivalent to a diff from d24a0f4c43 to f3b8ce03c9
|
2012-10-31
| ||
| 21:16 | Converting the server receive works. check-in: ea995f8a70 user: matt tags: monitor-cleanup | |
| 20:54 | Converted some, reverted some, borked Closed-Leaf check-in: 3fa64f636a user: matt | |
| 17:17 | Switched to receive-message* which supposedly does not block chicken threads check-in: f3b8ce03c9 user: mrwellan tags: defunct-try-of-non-blocking-receive | |
| 17:03 | Login/logout list and kill working nicely check-in: d24a0f4c43 user: mrwellan tags: monitor-cleanup | |
| 14:31 | Got remote login with client signature and login key working check-in: 05e3308da2 user: mrwellan tags: monitor-cleanup | |
Modified db.scm from [8e7dce497a] to [fdb669a25b].
| ︙ | ︙ | |||
1166 1167 1168 1169 1170 1171 1172 |
(define (db:string->obj msg)(with-input-from-string msg (lambda ()(deserialize))))
(define (cdb:client-call zmq-socket . params)
(debug:print-info 11 "cdb:client-call zmq-socket=" zmq-socket " params=" params)
(let ((zdat (db:obj->string params)) ;; (with-output-to-string (lambda ()(serialize params))))
(res #f))
(send-message zmq-socket zdat)
| | | 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 |
(define (db:string->obj msg)(with-input-from-string msg (lambda ()(deserialize))))
(define (cdb:client-call zmq-socket . params)
(debug:print-info 11 "cdb:client-call zmq-socket=" zmq-socket " params=" params)
(let ((zdat (db:obj->string params)) ;; (with-output-to-string (lambda ()(serialize params))))
(res #f))
(send-message zmq-socket zdat)
(set! res (db:string->obj (receive-message* zmq-socket zdat)))
(debug:print-info 11 "zmq-socket " (car params) " res=" res)
res))
(define (cdb:set-verbosity zmq-socket val)
(cdb:client-call zmq-socket 'set-verbosity #f val))
(define (cdb:login zmq-socket keyval signature)
|
| ︙ | ︙ |
Modified server.scm from [2fc90a75bd] to [6908adafb0].
| ︙ | ︙ | |||
58 59 60 61 62 63 64 |
(begin
(debug:print-info 0 "Queue not flushed, waiting ...")
(loop)))))))
;; The heavy lifting
;;
(let loop ()
| | | 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 |
(begin
(debug:print-info 0 "Queue not flushed, waiting ...")
(loop)))))))
;; The heavy lifting
;;
(let loop ()
(let* ((rawmsg (receive-message* zmq-socket))
(params (db:string->obj rawmsg)) ;; (with-input-from-string rawmsg (lambda ()(deserialize))))
(res #f))
(debug:print-info 12 "server=> received params=" params)
(set! res (cdb:cached-access params))
(debug:print-info 12 "server=> processed res=" res)
(send-message zmq-socket (db:obj->string res))
(if (not *time-to-exit*)
|
| ︙ | ︙ |