Overview
Comment: | Separation of concerns; server is in mtserver and server stuff (will be) removed from megatest |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v2.0001 |
Files: | files | file ages | folders |
SHA1: |
7889ffe9e5aad69ed0e403ad18548013 |
User & Date: | mrwellan on 2022-01-26 14:45:08 |
Other Links: | branch diff | manifest | tags |
Context
2022-01-26
| ||
18:20 | Wait five seconds after launching a test before throttling the runner loop. check-in: 682af2eb81 user: matt tags: v2.0001 | |
14:45 | Separation of concerns; server is in mtserver and server stuff (will be) removed from megatest check-in: 7889ffe9e5 user: mrwellan tags: v2.0001 | |
2022-01-25
| ||
18:39 | Added ulex-dual and mtserve.scm check-in: df862b5fff user: mrwellan tags: v2.0001 | |
Changes
Modified Makefile from [e7f3c30cb1] to [bd818b60a3].
︙ | ︙ | |||
20 21 22 23 24 25 26 | SHELL=/bin/bash PREFIX=$(PWD) CSCOPTS= INSTALL=install SRCFILES = # all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut ndboard | | | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | SHELL=/bin/bash PREFIX=$(PWD) CSCOPTS= INSTALL=install SRCFILES = # all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut ndboard all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtserve # add dboard mtut and tcmt back later # Configuration stuff transport-flavor : @echo Creating transport-flavor with full as flavor. Options include: full, simple echo full > transport-flavor |
︙ | ︙ | |||
216 217 218 219 220 221 222 223 224 225 226 227 228 229 | csc $(CSCOPTS) -c $< $(MOFILES) $(PREFIX)/bin/.$(ARCHSTR)/mtest : mtest utils/mk_wrapper @echo Installing to PREFIX=$(PREFIX) $(INSTALL) mtest $(PREFIX)/bin/.$(ARCHSTR)/mtest utils/mk_wrapper $(PREFIX) mtest $(PREFIX)/bin/megatest chmod a+x $(PREFIX)/bin/megatest $(PREFIX)/bin/.$(ARCHSTR)/ndboard : ndboard $(INSTALL) ndboard $(PREFIX)/bin/.$(ARCHSTR)/ndboard $(PREFIX)/bin/newdashboard : $(PREFIX)/bin/.$(ARCHSTR)/ndboard utils/mk_wrapper utils/mk_wrapper $(PREFIX) ndboard $(PREFIX)/bin/newdashboard chmod a+x $(PREFIX)/bin/newdashboard | > > > > > > | 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 | csc $(CSCOPTS) -c $< $(MOFILES) $(PREFIX)/bin/.$(ARCHSTR)/mtest : mtest utils/mk_wrapper @echo Installing to PREFIX=$(PREFIX) $(INSTALL) mtest $(PREFIX)/bin/.$(ARCHSTR)/mtest utils/mk_wrapper $(PREFIX) mtest $(PREFIX)/bin/megatest chmod a+x $(PREFIX)/bin/megatest $(PREFIX)/bin/.$(ARCHSTR)/mtserve : mtserve utils/mk_wrapper @echo Installing to PREFIX=$(PREFIX) $(INSTALL) mtserve $(PREFIX)/bin/.$(ARCHSTR)/mtserve utils/mk_wrapper $(PREFIX) mtserve $(PREFIX)/bin/mtserver chmod a+x $(PREFIX)/bin/mtserver $(PREFIX)/bin/.$(ARCHSTR)/ndboard : ndboard $(INSTALL) ndboard $(PREFIX)/bin/.$(ARCHSTR)/ndboard $(PREFIX)/bin/newdashboard : $(PREFIX)/bin/.$(ARCHSTR)/ndboard utils/mk_wrapper utils/mk_wrapper $(PREFIX) ndboard $(PREFIX)/bin/newdashboard chmod a+x $(PREFIX)/bin/newdashboard |
︙ | ︙ | |||
347 348 349 350 351 352 353 | # $(PREFIX)/bin/.$(ARCHSTR)/mtexec $(PREFIX)/bin/mtexec $(PREFIX)/bin/serialize-env \ # $(PREFIX)/bin/viewscreen $(PREFIX)/bin/mtutil \ # $(PREFIX)/bin/.$(ARCHSTR)/lib/libpangox-1.0.so \ # $(PREFIX)/bin/.$(ARCHSTR)/lib/libpangox-1.0.so.0 \ # $(PREFIX)/bin/.$(ARCHSTR)/lib/libxcb-xlib.so.0 # $(PREFIX)/bin/tcmt | > > > | > | 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 | # $(PREFIX)/bin/.$(ARCHSTR)/mtexec $(PREFIX)/bin/mtexec $(PREFIX)/bin/serialize-env \ # $(PREFIX)/bin/viewscreen $(PREFIX)/bin/mtutil \ # $(PREFIX)/bin/.$(ARCHSTR)/lib/libpangox-1.0.so \ # $(PREFIX)/bin/.$(ARCHSTR)/lib/libpangox-1.0.so.0 \ # $(PREFIX)/bin/.$(ARCHSTR)/lib/libxcb-xlib.so.0 # $(PREFIX)/bin/tcmt $(PREFIX)/bin/megatest : $(PREFIX)/bin/.$(ARCHSTR)/mtest $(PREFIX)/bin/mtserver : $(PREFIX)/bin/.$(ARCHSTR)/mtserve install : $(PREFIX)/bin/.$(ARCHSTR) $(PREFIX)/bin/.$(ARCHSTR)/mtest \ $(PREFIX)/bin/megatest $(PREFIX)/bin/mtserver \ $(HELPERS) $(PREFIX)/bin/nbfake \ $(PREFIX)/bin/serialize-env \ $(PREFIX)/bin/nbfind $(PREFIX)/bin/mtrunner $(PREFIX)/bin/mt_xterm \ $(PREFIX)/share/docs/megatest_manual.html $(PREFIX)/bin/remrun \ $(PREFIX)/share/db/mt-pg.sql \ $(PREFIX)/share/js/jquery-3.1.0.slim.min.js \ $(PREFIX)/bin/.$(ARCHSTR)/dboard $(PREFIX)/bin/dashboard \ |
︙ | ︙ |
Modified apimod.scm from [37041542cf] to [e1bfe096ff].
︙ | ︙ | |||
173 174 175 176 177 178 179 | (logd (conc apath "/logs")) (logf (conc logd "/server-launch-";;(current-process-id) (seconds->year-work-week/day-time-fname (current-seconds)) "-"cleandbname".log")) (logf2 (conc logd "/server-" (seconds->year-work-week/day-time-fname (current-seconds)) "-"cleandbname"-")) | | | 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 | (logd (conc apath "/logs")) (logf (conc logd "/server-launch-";;(current-process-id) (seconds->year-work-week/day-time-fname (current-seconds)) "-"cleandbname".log")) (logf2 (conc logd "/server-" (seconds->year-work-week/day-time-fname (current-seconds)) "-"cleandbname"-")) (cmd (conc "nbfake mtserver -server - -area "apath" -db "dbname) ;; " -autolog "logf2 ;; the side log did not help. Ended up with two logs and the pid in the name was not that useful. )) (if (not (directory-exists? logd)) (create-directory logd #t)) (system (conc "NBFAKE_LOG="logf" "cmd)))) ;; special function to get server |
︙ | ︙ |
Modified mtserve.scm from [7f7ba83fa1] to [8e967876ca].
︙ | ︙ | |||
60 61 62 63 64 65 66 | ;; (include "call-with-environment-variables/call-with-environment-variables.scm") (module mtserve * (import scheme | | | | | 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 | ;; (include "call-with-environment-variables/call-with-environment-variables.scm") (module mtserve * (import scheme chicken.base ;; chicken.bitwise ;; chicken.condition ;; ;; chicken.csi ;; chicken.eval ;; chicken.file ;; chicken.file.posix ;; chicken.format ;; chicken.io ;; chicken.irregex ;; chicken.pathname ;; chicken.port ;; chicken.pretty-print ;; chicken.process chicken.process-context ;; chicken.process-context.posix ;; chicken.process.signal ;; chicken.random ;; chicken.repl ;; chicken.sort chicken.string ;; chicken.tcp ;; chicken.time ;; chicken.time.posix ;; ;; (prefix base64 base64:) ;; (prefix sqlite3 sqlite3:) ;; (prefix sxml-modifications sxml-) |
︙ | ︙ | |||
120 121 122 123 124 125 126 | ;; system-information ;; typed-records ;; uri-common ;; z3 ;; ;; srfi-1 ;; srfi-4 | | | | | | | | 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 | ;; system-information ;; typed-records ;; uri-common ;; z3 ;; ;; srfi-1 ;; srfi-4 srfi-18 ;; srfi-13 ;; srfi-98 ;; srfi-69 ;; ;; ;; local modules ;; autoload ;; adjutant ;; csv-xml ;; ;; hostinfo ;; mtver ;; mutils ;; cookie ;; csv-xml ;; ducttape-lib (prefix mtargs args:) ;; pkts ;; stml2 ;; (prefix dbi dbi:) ;; ;; apimod ;; archivemod ;; bigmod commonmod ;; configfmod ;; dbmod debugprint ;; ezstepsmod launchmod ;; processmod ;; rmtmod ;; runsmod ;; servermod ;; tasksmod ;; testsmod dbmgrmod ;; ;; ulex ) ;; ;; ulex parameters ;; (work-method 'direct) ;; (return-method 'direct) |
︙ | ︙ | |||
191 192 193 194 195 196 197 198 199 200 | ;; (include "tests.scm") ;; (include "genexample.scm") ;; (include "tdb.scm") ;; (include "env.scm") ;; (include "diff-report.scm") ;; (include "ods.scm") ;; (define (main) (let ((tl (launch:setup)) | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > | > | | | | | | 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 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 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 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 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 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 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 | ;; (include "tests.scm") ;; (include "genexample.scm") ;; (include "tdb.scm") ;; (include "env.scm") ;; (include "diff-report.scm") ;; (include "ods.scm") ;; ;; process args (define remargs (args:get-args (argv) (list ;; "-runtests" ;; run a specific test ;; "-config" ;; override the config file name ;; "-append-config" ;; "-execute" ;; run the command encoded in the base64 parameter ;; "-step" ;; "-target" ;; "-reqtarg" ;; ":runname" ;; "-runname" ;; ":state" ;; "-state" ;; ":status" ;; "-status" ;; "-list-runs" ;; "-testdata-csv" ;; "-testpatt" ;; "--modepatt" ;; "-modepatt" ;; "-tagexpr" ;; "-itempatt" ;; "-setlog" ;; "-set-toplog" ;; "-runstep" ;; "-logpro" ;; "-m" ;; "-rerun" ;; ;; "-days" ;; "-rename-run" ;; "-to" ;; "-dest" ;; "-source" ;; "-time-stamp" ;; ;; values and messages ;; ":category" ;; ":variable" ;; ":value" ;; ":expected" ;; ":tol" ;; ":units" ;; ;; ;; misc ;; "-start-dir" ;; "-run-patt" ;; "-target-patt" ;; "-contour" ;; "-area-tag" ;; "-area" ;; "-run-tag" "-server" "-db" ;; file name for setting up a server ;; "-adjutant" ;; "-transport" ;; "-port" ;; "-extract-ods" ;; "-pathmod" ;; "-env2file" ;; "-envcap" ;; "-envdelta" ;; "-setvars" ;; "-set-state-status" ;; ;; ;; move runs stuff here ;; "-remove-keep" ;; "-set-run-status" ;; "-age" ;; ;; ;; archive ;; "-archive" ;; "-actions" ;; "-precmd" ;; "-include" ;; "-exclude-rx" ;; "-exclude-rx-from" ;; "-debug" ;; for *verbosity* > 2 ;; "-debug-noprop" ;; "-create-test" ;; "-override-timeout" ;; "-test-files" ;; -test-paths is for listing all ;; "-load" ;; load and exectute a scheme file ;; "-section" ;; "-var" ;; "-dumpmode" ;; "-run-id" ;; "-ping" ;; "-refdb2dat" ;; "-o" ;; "-log" ;; "-autolog" ;; "-sync-log" ;; "-since" ;; "-fields" ;; "-recover-test" ;; run-id,test-id - used internally to recover a test stuck in RUNNING state ;; "-sort" ;; "-target-db" ;; "-source-db" ;; "-prefix-target" ;; ;; "-src-target" ;; "-src-runname" ;; "-diff-email" ;; "-sync-to" ;; "-pgsync" ;; "-kill-wait" ;; wait this long before removing test (default is 10 sec) ;; "-diff-html" ;; ;; ;; wizards, area capture, setup new ... ;; "-extract-skeleton" ) (list "-h" "-help" "--help" ;; "-manual" "-version" ;; "-force" ;; "-xterm" ;; "-showkeys" ;; "-show-keys" ;; "-test-status" ;; "-set-values" ;; "-load-test-data" ;; "-summarize-items" ;; "-gui" ;; "-daemonize" ;; "-preclean" ;; "-rerun-clean" ;; "-rerun-all" ;; "-clean-cache" ;; "-no-cache" ;; "-cache-db" ;; "-cp-eventtime-to-publishtime" ;; "-use-db-cache" ;; "-prepend-contour" ;; ;; ;; ;; misc ;; "-repl" ;; "-lock" ;; "-unlock" ;; "-list-servers" ;; "-kill-servers" ;; "-run-wait" ;; wait on a run to complete (i.e. no RUNNING) ;; "-one-pass" ;; ;; "-local" ;; run some commands using local db access ;; "-generate-html" ;; "-generate-html-structure" ;; "-list-run-time" ;; "-list-test-time" ;; ;; ;; misc queries ;; "-list-disks" ;; "-list-targets" ;; "-list-db-targets" ;; "-show-runconfig" ;; "-show-config" ;; "-show-cmdinfo" ;; "-get-run-status" ;; "-list-waivers" ;; ;; ;; queries ;; "-test-paths" ;; get path(s) to a test, ordered by youngest first ;; ;; "-runall" ;; run all tests, respects -testpatt, defaults to % ;; "-run" ;; alias for -runall ;; "-remove-runs" ;; "-kill-runs" ;; "-kill-rerun" ;; "-keep-records" ;; use with -remove-runs to remove only the run data ;; "-rebuild-db" ;; "-cleanup-db" ;; "-rollup" ;; "-update-meta" ;; "-create-megatest-area" ;; "-mark-incompletes" ;; ;; "-convert-to-norm" ;; "-convert-to-old" ;; "-import-megatest.db" ;; "-sync-to-megatest.db" ;; "-sync-brute-force" ;; "-logging" ;; "-v" ;; verbose 2, more than normal (normal is 1) ;; "-q" ;; quiet 0, errors/warnings only ;; ;; "-diff-rep" ;; ;; "-syscheck" ;; "-obfuscate" ;; junk placeholder ;; "-:p" ) args:arg-hash 0)) ;; Add args that use remargs here ;; (if (not (null? remargs)) (debug:print-error 0 *default-log-port* "Unrecognised arguments: " (string-intersperse (if (list? remargs) remargs (argv)) " "))) ;; load the ~/.megatestrc file, put (use trace)(trace-call-sites #t)(trace function-you-want-to-trace) in this file ;; (let ((debugcontrolf (conc (get-environment-variable "HOME") "/.mtserverc"))) (if (common:file-exists? debugcontrolf) (load debugcontrolf))) ;; before doing anything else change to the start-dir if provided ;; (if (args:get-arg "-start-dir") (if (common:file-exists? (args:get-arg "-start-dir")) (let ((fullpath (common:real-path (args:get-arg "-start-dir")))) (set-environment-variable! "PWD" fullpath) (change-directory fullpath)) (begin (debug:print-error 0 *default-log-port* "non-existant start dir " (args:get-arg "-start-dir") " specified, exiting.") (exit 1)))) (define (main) (debug:setup) (make-and-init-bigdata) (let ((tl (launch:setup)) (dbname (args:get-arg "-db"))) (if dbname (rmt:server-launch dbname) (debug:print 0 *default-log-port* "Usage: mtserve -db <dbpath/file>.db")))) #;(set! *didsomething* #t) (thread-join! (thread-start! (make-thread main))) ) ;; (define *usage-log-file* #f) ;; put path to file for logging usage in this var in the ~/.megatestrc file ;; (define *usage-use-seconds* #t) ;; for Epoc seconds in usage logging change this to #t in ~/.megatestrc file ;; ;; ;;====================================================================== |
︙ | ︙ |
Modified tests/simplerun/debug.scm from [0b0b787662] to [1bee670fb9].
︙ | ︙ | |||
33 34 35 36 37 38 39 | (s 0)) ;; sum (let ((start-time (current-milliseconds)) (run-id (+ r (make-run-id)))) (rmt:register-test run-id "test1" (conc "item_" i)) (thread-sleep! 0.01) (let* ((qry-time (- (current-milliseconds) start-time)) (tot-query-time (+ qry-time s)) | | > | | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 | (s 0)) ;; sum (let ((start-time (current-milliseconds)) (run-id (+ r (make-run-id)))) (rmt:register-test run-id "test1" (conc "item_" i)) (thread-sleep! 0.01) (let* ((qry-time (- (current-milliseconds) start-time)) (tot-query-time (+ qry-time s)) (avg-query-time (* 1.0 (/ tot-query-time (max i 1))))) (if (> qry-time 500) (print "WARNING: rmt:register-test took more than 500ms, "qry-time"ms, i="i", avg-query-time="avg-query-time)) (if (eq? (modulo i 100) 0) (print "For run-id="run-id", "(rmt:get-keys-write)" num tests registered="i" avg-query-time="avg-query-time)) (if (< i 500) (loop r (+ i 1) tot-query-time) (if (< r 100) (let* ((start-time (current-milliseconds))) (print "rmt:get-keys "(rmt:get-keys)" in "(- (current-milliseconds) start-time)) ;; run-id testpatt states statuses offset limit not-in sort-by sort-order qryvals last-update mode (print "Got "(length (rmt:get-tests-for-run run-id "%" '() '() #f #f #f #f #f #f 0 #f))" tests for run "run-id) (print "Average query time: "avg-query-time) (loop (+ r 1) 0 tot-query-time)))))))) ))) (thread-start! th1) (thread-join! th1))) (run) |
︙ | ︙ |
Modified ulex-dual/dbmgr.scm from [3233b20f1f] to [53b181f4c9].
︙ | ︙ | |||
875 876 877 878 879 880 881 | (if (and (not is-main) (common:low-noise-print 60 "servdat-status")) (debug:print-info 0 *default-log-port* "servdat-status is " (servdat-status *db-serv-info*))) (mutex-lock! *heartbeat-mutex*) ;; set up the database handle (if (not *dbstruct-db*) ;; no db opened yet, open the db and register with main if appropriate | | | 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 | (if (and (not is-main) (common:low-noise-print 60 "servdat-status")) (debug:print-info 0 *default-log-port* "servdat-status is " (servdat-status *db-serv-info*))) (mutex-lock! *heartbeat-mutex*) ;; set up the database handle (if (not *dbstruct-db*) ;; no db opened yet, open the db and register with main if appropriate (let ((watchdog #f)) ;; (bdat-watchdog *bdat*))) (debug:print 0 *default-log-port* "SERVER: dbprep") (db:setup dbname) ;; sets *dbstruct-db* as side effect (servdat-status-set! *db-serv-info* 'db-opened) ;; IFF I'm not main, call into main and register self (if (not is-main) (let ((res (rmt:register-server sinfo *toppath* iface port |
︙ | ︙ |