Overview
Comment: | Loop back test passes for ulex |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v2.001 |
Files: | files | file ages | folders |
SHA1: |
bd0896dbd606ba22a364231def1c817c |
User & Date: | matt on 2021-12-23 18:46:16 |
Other Links: | branch diff | manifest | tags |
Context
2021-12-23
| ||
18:49 | Loop back test passes for ulex check-in: be9a24b8c3 user: matt tags: v2.001 | |
18:46 | Loop back test passes for ulex check-in: bd0896dbd6 user: matt tags: v2.001 | |
16:33 | ulex compiles check-in: 8860d05092 user: matt tags: v2.001 | |
Changes
Modified ulex/ulex.scm from [b7f1e11e85] to [0281515147].
︙ | ︙ | |||
31 32 33 34 35 36 37 38 39 40 41 42 43 44 | (import scheme chicken.base chicken.file chicken.time chicken.condition chicken.string chicken.sort address-info mailbox matchable queues regex regex-case | > | 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 | (import scheme chicken.base chicken.file chicken.time chicken.condition chicken.string chicken.sort chicken.pretty-print address-info mailbox matchable queues regex regex-case |
︙ | ︙ | |||
126 127 128 129 130 131 132 | ;; ;; NOTE: see below for beginnings of code to allow re-use of tcp connections ;; - I believe (without substantial evidence) that re-using connections will ;; be beneficial ... ;; (define (send udata host-port qrykey cmd params) (let* ((my-host-port (udat-host-port udata)) ;; remote will return to this | | | 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 | ;; ;; NOTE: see below for beginnings of code to allow re-use of tcp connections ;; - I believe (without substantial evidence) that re-using connections will ;; be beneficial ... ;; (define (send udata host-port qrykey cmd params) (let* ((my-host-port (udat-host-port udata)) ;; remote will return to this (isme #f #;(equal? host-port my-host-port)) ;; calling myself? ;; dat is a self-contained work block that can be sent or handled locally (dat (list my-host-port qrykey cmd params)) ) (if isme (ulex-handler udata dat) ;; no transmission needed (handle-exceptions ;; TODO - MAKE THIS EXCEPTION CMD SPECIFIC? exn |
︙ | ︙ | |||
160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 | (mbox (cdr cmbox)) (mbox-time (current-milliseconds))) (if (eq? (send uconn host-port qrykey cmd data) 'ack) (let* ((mbox-timeout-secs 120) ;; timeout) (mbox-timeout-result 'MBOX_TIMEOUT) (res (mailbox-receive! mbox mbox-timeout-secs mbox-timeout-result)) (mbox-receive-time (current-milliseconds))) (if (eq? res 'MBOX_TIMEOUT) #f ;; convert to raising exception? res)) #f))) ;; #f means failed to communicate ;;====================================================================== ;; responder side ;;====================================================================== ;; take a request, rdata, and if not immediate put it in the work queue ;; ;; Reserved cmds; ack ping goodbye response ;; (define (ulex-handler uconn rdata) (print "ulex-handler received data: "rdata) (match rdata ;; (string-split controldat) ((rem-host-port qrykey cmd params) ;; cmdkey host-port pid qrykey params ...) | > > | | | > > > | | > | | < > | > | | | | | 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 | (mbox (cdr cmbox)) (mbox-time (current-milliseconds))) (if (eq? (send uconn host-port qrykey cmd data) 'ack) (let* ((mbox-timeout-secs 120) ;; timeout) (mbox-timeout-result 'MBOX_TIMEOUT) (res (mailbox-receive! mbox mbox-timeout-secs mbox-timeout-result)) (mbox-receive-time (current-milliseconds))) (print "In send-receive, got "res" back from mailbox") (if (eq? res 'MBOX_TIMEOUT) #f ;; convert to raising exception? res)) #f))) ;; #f means failed to communicate ;;====================================================================== ;; responder side ;;====================================================================== ;; take a request, rdata, and if not immediate put it in the work queue ;; ;; Reserved cmds; ack ping goodbye response ;; (define (ulex-handler uconn rdata) (print "ulex-handler received data: "rdata) (match rdata ;; (string-split controldat) ((rem-host-port qrykey cmd params) ;; cmdkey host-port pid qrykey params ...) (let ((mbox (hash-table-ref/default (udat-mboxes uconn) qrykey #f))) (case cmd ;; ((ack )(print "Got ack! But why? Should NOT get here.") 'ack) ((ping) (print "Got Ping!") (add-to-work-queue uconn rdata) 'ack) ((goodbye) ;; just clear out references to the caller (add-to-work-queue uconn rdata) 'ack) ((response) ;; this is a result from remote processing, send it as mail ... (if mbox (begin (mailbox-send! mbox params) ;; params here is our result 'ack) (begin (print "ERROR: received result but no associated mbox for cookie "qrykey) #f))) ((else (add-to-work-queue uconn rdata) 'ack))))) (else (print "BAD DATA? controldat=" rdata) 'ack) ;; send ack anyway? )) ;; given an already set up uconn start the cmd-loop ;; |
︙ | ︙ | |||
222 223 224 225 226 227 228 229 230 231 232 233 | (udat-work-proc-set! uconn proc)) ;; run-listener does all the work of starting a listener in a thread ;; it then returns control ;; (define (run-listener handler-proc) (let* ((uconn (make-udat))) (if (setup-listener uconn) (let* ((th1 (make-thread (lambda ()(ulex-cmd-loop uconn)) "Ulex command loop")) (th2 (make-thread (lambda ()(process-work-queue uconn)) "Ulex work queue processor"))) (thread-start! th1) (thread-start! th2) | > < > > > | | 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 | (udat-work-proc-set! uconn proc)) ;; run-listener does all the work of starting a listener in a thread ;; it then returns control ;; (define (run-listener handler-proc) (let* ((uconn (make-udat))) (udat-work-proc-set! uconn handler-proc) (if (setup-listener uconn) (let* ((th1 (make-thread (lambda ()(ulex-cmd-loop uconn)) "Ulex command loop")) (th2 (make-thread (lambda ()(process-work-queue uconn)) "Ulex work queue processor"))) (thread-start! th1) (thread-start! th2) (print "cmd loop and process workers started") uconn) (begin (print "ERROR: run-listener called without proper setup.") (exit))))) ;;====================================================================== ;; work queues - this is all happening on the listener side ;;====================================================================== ;; rdata is (rem-host-port qrykey cmd params) (define (add-to-work-queue uconn rdata) (queue-add! (udat-work-queue uconn) rdata)) (define (do-work uconn rdata) (let* ((proc (udat-work-proc uconn))) ;; get it each time - conceivebly it could change ;; put this following into a do-work procedure (match rdata ((rem-host-port qrykey cmd params) (let* ((result (proc rem-host-port qrykey cmd params))) ;; send 'response as cmd and result as params (send uconn rem-host-port qrykey 'response result))) ;; could check for ack (else (print "ERROR: rdata "rdata", did not match rem-host-port qrykey cmd params"))))) (define (process-work-queue uconn) (let ((wqueue (udat-work-queue uconn)) (proc (udat-work-proc uconn))) |
︙ | ︙ | |||
308 309 310 311 312 313 314 | ;; cookie/mboxes ;; we store each mbox with a cookie (<cookie> . <mbox>) ;; (define (get-cmbox uconn) (if (null? (udat-avail-cmboxes uconn)) | | | | > | 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 | ;; cookie/mboxes ;; we store each mbox with a cookie (<cookie> . <mbox>) ;; (define (get-cmbox uconn) (if (null? (udat-avail-cmboxes uconn)) (let ((cookie (make-cookie uconn)) (mbox (make-mailbox))) (hash-table-set! (udat-mboxes uconn) cookie mbox) `(,cookie . ,mbox)) (let ((cmbox (car (udat-avail-cmboxes uconn)))) (udat-avail-cmboxes-set! uconn (cdr (udat-avail-cmboxes uconn))) cmbox))) (define (put-cmbox uconn cmbox) (udat-avail-cmboxes-set! uconn (cons cmbox (udat-avail-cmboxes uconn)))) (define (pp-uconn uconn) (pp (udat->alist uconn))) ;;====================================================================== ;; network utilities ;;====================================================================== ;; NOTE: Look at address-info egg as alternative to some of this |
︙ | ︙ | |||
361 362 363 364 365 366 367 368 | (filter (lambda (x) (equal? (address-info-type x) "tcp")) (address-infos (get-host-name))))) ;; (map ip->string (vector->list ;; (hostinfo-addresses ;; (host-information (current-hostname)))))) | | | > | > > > > > > > > > > > > > > > > > > > > > > | 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 | (filter (lambda (x) (equal? (address-info-type x) "tcp")) (address-infos (get-host-name))))) ;; (map ip->string (vector->list ;; (hostinfo-addresses ;; (host-information (current-hostname)))))) ) (import ulex trace big-chicken srfi-18) (trace-call-sites #t) (trace ulex-handler send) (define (handler-proc . data) (print "handler-proc, got: "data) `(data ,data)) (define uconn (run-listener handler-proc)) (pp-uconn uconn) (define res #f) (define th1 (make-thread (lambda () (set! res (send-receive uconn "zeus:4242" 'ping '()))))) (thread-start! th1) (thread-join! th1) (thread-sleep! 1) (print "All done") (print "Received "res) |