Changes In Branch multi-transport Through [5deab59f4e] Excluding Merge-Ins
This is equivalent to a diff from 6bba674f33 to 5deab59f4e
2013-01-29
| ||
10:15 | Merged multi-transport to trunk, all tests passed check-in: 19f85b577e user: mrwellan tags: trunk | |
2013-01-27
| ||
19:55 | Patched in zmq changes. Not functional yet check-in: 22a2d4ad0b user: matt tags: multi-transport | |
16:45 | Default of direct fs access done check-in: 5deab59f4e user: matt tags: multi-transport | |
13:14 | Creating branch for multi transport options, http, rpc, zmq, and network fs check-in: 66763d5399 user: matt tags: multi-transport | |
13:11 | merged trunk into sqlite3-logging Closed-Leaf check-in: 7bd6b6dae6 user: matt tags: sqlite3-logging | |
12:22 | Merged http-transport to trunk check-in: 6bba674f33 user: matt tags: trunk | |
12:17 | Merged zmq-3.2.2 to trunk check-in: 3be673e9be user: matt tags: trunk | |
10:04 | Streamlined db access a little, test4 completes in reasonable time Closed-Leaf check-in: a893c641ca user: matt tags: http-transport | |
Modified Makefile from [a4b44c1e54] to [aa9943da6e].
1 2 3 4 5 6 7 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 | - + + | PREFIX=$(PWD) CSCOPTS= INSTALL=install SRCFILES = common.scm items.scm launch.scm \ ods.scm runconfig.scm server.scm configf.scm \ db.scm keys.scm margs.scm megatest-version.scm \ |
︙ |
Modified common.scm from [1ba863b641] to [a6d027f297].
︙ | |||
38 39 40 41 42 43 44 45 46 47 48 49 50 51 | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | + + | (define *waiting-queue* (make-hash-table)) (define *test-meta-updated* (make-hash-table)) (define *globalexitstatus* 0) ;; attempt to work around possible thread issues (define *passnum* 0) ;; when running track calls to run-tests or similar ;; SERVER (define *my-client-signature* #f) (define *transport-type* 'fs) (define *megatest-db* #f) (define *rpc:listener* #f) ;; if set up for server communication this will hold the tcp port (define *runremote* #f) ;; if set up for server communication this will hold <host port> (define *last-db-access* (current-seconds)) ;; update when db is accessed via server (define *max-cache-size* 0) (define *logged-in-clients* (make-hash-table)) (define *client-non-blocking-mode* #f) (define *server-id* #f) |
︙ |
Modified db.scm from [4a4c4c2fc7] to [cedb890a0b].
︙ | |||
20 21 22 23 24 25 26 27 28 29 30 31 32 33 | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | + | (import (prefix sqlite3 sqlite3:)) (import (prefix base64 base64:)) (declare (unit db)) (declare (uses common)) (declare (uses keys)) (declare (uses ods)) (declare (uses fs-transport)) (include "common_records.scm") (include "db_records.scm") (include "key_records.scm") (include "run_records.scm") ;; timestamp type (val1 val2 ...) |
︙ | |||
1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 | 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 | + + + + + + - + - - + - - - - - + + + + + + - - - + + - - - - - + + + + - - - + - - - - - - - - - - - - - - - - - - + - - - - - - - - | (let ((res (proc))) (set! *client-non-blocking-mode* #f) res)) ;; params = 'target cached remparams ;; ;; make-vector-record cdb packet client-sig qtype immediate query-sig params qtime ;; ;; cdb:client-call is the unified interface to all the transports. It dispatches the ;; query to a server routine (e.g. server:client-send-recieve) that ;; transports the data to the server where it is passed to db:process-queue-item ;; which either returns the data to the calling server routine or ;; directly calls the returning procedure (e.g. zmq). ;; (define (cdb:client-call serverdat qtype immediate numretries . params) (debug:print-info 11 "cdb:client-call serverdat=" serverdat ", qtype=" qtype ", immediate=" immediate ", numretries=" numretries ", params=" params) |
︙ |
Added fs-transport.scm version [d187681c70].
|
Added http-transport.scm version [12f5deda72].