Comment: | moved the old compilation unit files to the attic, removed some debug stuff of Brandons, TODO: put that stuff into a module and enable use of it. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.65-try3 |
Files: | files | file ages | folders |
SHA1: |
7e32aa8d9e0889efc2f30250e52aa82a |
User & Date: | matt on 2019-12-06 04:16:21 |
Other Links: | branch diff | manifest | tags |
2019-12-06
| ||
04:37 | Removed couple more uses of debug stuff. check-in: dde06b663f user: matt tags: v1.65-try3 | |
04:16 | moved the old compilation unit files to the attic, removed some debug stuff of Brandons, TODO: put that stuff into a module and enable use of it. check-in: 7e32aa8d9e user: matt tags: v1.65-try3 | |
2019-12-04
| ||
14:26 | Re-enabling the updater as it works fine on SLES11! check-in: 69d1d314cd user: mrwellan tags: v1.65-try3 | |
Modified Makefile from [a6e512f29c] to [a146f652e2].
︙ | ︙ | |||
17 18 19 20 21 22 23 | # make install CSCOPTS='-accumulate-profile -profile-name $(PWD)/profile-ww$(shell date +%V.%u)' # rm <files>.o ; make install CSCOPTS='-profile' ; ... ; chicken-profile | less SHELL=/bin/bash PREFIX=$(PWD) CSCOPTS= INSTALL=install | | | | | | | | | | > | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | # make install CSCOPTS='-accumulate-profile -profile-name $(PWD)/profile-ww$(shell date +%V.%u)' # rm <files>.o ; make install CSCOPTS='-profile' ; ... ; chicken-profile | less SHELL=/bin/bash PREFIX=$(PWD) CSCOPTS= INSTALL=install DELFILES = common.scm items.scm launch.scm \ ods.scm runconfig.scm server.scm configf.scm \ db.scm keys.scm margs.scm megatest-version.scm \ process.scm runs.scm tasks.scm tests.scm genexample.scm \ http-transport.scm filedb.scm tdb.scm \ client.scm mt.scm \ ezsteps.scm lock-queue.scm sdb.scm \ rmt.scm api.scm subrun.scm \ portlogger.scm archive.scm env.scm diff-report.scm cgisetup/models/pgdb.scm SRCFILES= # removed from MSRCFILES: ftail.scm # module source files MSRCFILES = dbmod.scm rmtmod.scm commonmod.scm apimod.scm \ archivemod.scm clientmod.scm envmod.scm ezstepsmod.scm itemsmod.scm \ |
︙ | ︙ | |||
238 239 240 241 242 243 244 | # $(MOFILES) : mofiles/commonmod.o megatest-fossil-hash.scm : $(SRCFILES) megatest.scm *_records.scm echo "(define megatest-fossil-hash \"$(MTESTHASH)\")" > megatest-fossil-hash.new if ! diff -q megatest-fossil-hash.new megatest-fossil-hash.scm ; then echo copying .new to .scm;cp -f megatest-fossil-hash.new megatest-fossil-hash.scm;fi | | | 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 | # $(MOFILES) : mofiles/commonmod.o megatest-fossil-hash.scm : $(SRCFILES) megatest.scm *_records.scm echo "(define megatest-fossil-hash \"$(MTESTHASH)\")" > megatest-fossil-hash.new if ! diff -q megatest-fossil-hash.new megatest-fossil-hash.scm ; then echo copying .new to .scm;cp -f megatest-fossil-hash.new megatest-fossil-hash.scm;fi $(MOFILES) $(OFILES) $(GOFILES) : common_records.scm %.o : %.scm $(MOFILES) csc $(CSCOPTS) -c $< $(MOFILES) $(PREFIX)/bin/.$(ARCHSTR)/mtest : mtest utils/mk_wrapper @echo Installing to PREFIX=$(PREFIX) $(INSTALL) mtest $(PREFIX)/bin/.$(ARCHSTR)/mtest |
︙ | ︙ | |||
521 522 523 524 525 526 527 | targets: @grep : Makefile | perl -ne '/^([A-Za-z0-9_-]+):/ && print "$$1\n"' unit : cd tests;make unit | > > > > > | 522 523 524 525 526 527 528 529 530 531 532 533 | targets: @grep : Makefile | perl -ne '/^([A-Za-z0-9_-]+):/ && print "$$1\n"' unit : cd tests;make unit delfiles : mv $(DELFILES) attic fossil mv $(DELFILES) attic |
Name change from api.scm to attic/api.scm.
︙ | ︙ |
Name change from archive.scm to attic/archive.scm.
︙ | ︙ |
Name change from client.scm to attic/client.scm.
︙ | ︙ |
Name change from common.scm to attic/common.scm.
︙ | ︙ |
Name change from configf.scm to attic/configf.scm.
︙ | ︙ |
Name change from db.scm to attic/db.scm.
︙ | ︙ |
Name change from diff-report.scm to attic/diff-report.scm.
︙ | ︙ |
Name change from env.scm to attic/env.scm.
︙ | ︙ |
Name change from ezsteps.scm to attic/ezsteps.scm.
︙ | ︙ |
Name change from filedb.scm to attic/filedb.scm.
︙ | ︙ |
Name change from genexample.scm to attic/genexample.scm.
︙ | ︙ |
Name change from http-transport.scm to attic/http-transport.scm.
︙ | ︙ |
Name change from items.scm to attic/items.scm.
︙ | ︙ |
Name change from keys.scm to attic/keys.scm.
︙ | ︙ |
Name change from launch.scm to attic/launch.scm.
︙ | ︙ |
Name change from lock-queue.scm to attic/lock-queue.scm.
︙ | ︙ |
Name change from margs.scm to attic/margs.scm.
︙ | ︙ |
Name change from mt.scm to attic/mt.scm.
︙ | ︙ |
Name change from ods.scm to attic/ods.scm.
︙ | ︙ |
Name change from cgisetup/models/pgdb.scm to attic/pgdb.scm.
︙ | ︙ |
Name change from portlogger.scm to attic/portlogger.scm.
︙ | ︙ |
Name change from process.scm to attic/process.scm.
︙ | ︙ |
Name change from rmt.scm to attic/rmt.scm.
︙ | ︙ |
Name change from runconfig.scm to attic/runconfig.scm.
︙ | ︙ |
Name change from runs.scm to attic/runs.scm.
︙ | ︙ |
Name change from sdb.scm to attic/sdb.scm.
︙ | ︙ |
Name change from server.scm to attic/server.scm.
︙ | ︙ |
Name change from subrun.scm to attic/subrun.scm.
︙ | ︙ |
Name change from tasks.scm to attic/tasks.scm.
︙ | ︙ |
Name change from tdb.scm to attic/tdb.scm.
︙ | ︙ |
Name change from tests.scm to attic/tests.scm.
︙ | ︙ |
Modified common_records.scm from [454bf13df1] to [ca85e255b3].
︙ | ︙ | |||
352 353 354 355 356 357 358 | (lambda () ;; (if *logging* ;; (exec-fn 'db:log-event (apply conc params)) (apply print params) )))) ;; ) ;; Brandon's debug printer shortcut (indulge me :) | | | | | | | | | | 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 | (lambda () ;; (if *logging* ;; (exec-fn 'db:log-event (apply conc params)) (apply print params) )))) ;; ) ;; Brandon's debug printer shortcut (indulge me :) ;; (define *BB-process-starttime* (current-milliseconds)) #;(define (BB> . in-args) (let* ((stack (get-call-chain)) (location "??")) (for-each (lambda (frame) (let* ((this-loc (vector-ref frame 0)) (temp (string-split (->string this-loc) " ")) (this-func (if (and (list? temp) (> (length temp) 1)) (cadr temp) "???"))) (if (equal? this-func "BB>") (set! location this-loc)))) stack) (let* ((color-on "\x1b[1m") (color-off "\x1b[0m") (dp-args (append (list 0 *default-log-port* (conc color-on location "@"(/ (- (current-milliseconds) *BB-process-starttime*) 1000) color-off " ") ) in-args))) (apply debug:print dp-args)))) ;; (define *BBpp_custom_expanders_list* (make-hash-table)) ;; register hash tables with BBpp. #;(hash-table-set! *BBpp_custom_expanders_list* HASH_TABLE: (cons hash-table? hash-table->alist)) ;; test name converter #;(define (BBpp_custom_converter arg) (let ((res #f)) (for-each (lambda (custom-type-name) (let* ((custom-type-info (hash-table-ref *BBpp_custom_expanders_list* custom-type-name)) (custom-type-test (car custom-type-info)) (custom-type-converter (cdr custom-type-info))) (when (and (not res) (custom-type-test arg)) (set! res (custom-type-converter arg))))) (hash-table-keys *BBpp_custom_expanders_list*)) (if res (BBpp_ res) arg))) #;(define (BBpp_ arg) (cond ;;((SOMESTRUCT? arg) (cons SOMESTRUCT: (SOMESTRUCT->alist arg))) ;;((dboard:tabdat? arg) (cons dboard:tabdat: (dboard:tabdat->alist arg))) ((hash-table? arg) (let ((al (hash-table->alist arg))) (BBpp_ (cons HASH_TABLE: al)))) ((null? arg) '()) ;;((list? arg) (cons (BBpp_ (car arg)) (BBpp_ (cdr arg)))) ((pair? arg) (cons (BBpp_ (car arg)) (BBpp_ (cdr arg)))) (else (BBpp_custom_converter arg)))) ;; Brandon's pretty printer. It expands hashes and custom types in addition to regular pp #;(define (BBpp arg) (pp (BBpp_ arg))) ;(use define-macro) #;(define-syntax inspect (syntax-rules () [(_ x) ;; (with-output-to-port (current-error-port) (printf "~a is: ~a\n" 'x (with-output-to-string (lambda () (BBpp x)))) ;; ) ] [(_ x y ...) (begin (inspect x) (inspect y ...))])) |
︙ | ︙ |
Modified server-inc.scm from [640528e606] to [7f62fa5249].
︙ | ︙ | |||
281 282 283 284 285 286 287 | (define (server:record->url servr) (match-let (((mod-time host port start-time pid) servr)) (if (and host port) (conc host ":" port) #f))) | | | 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 | (define (server:record->url servr) (match-let (((mod-time host port start-time pid) servr)) (if (and host port) (conc host ":" port) #f))) (define (server:get-client-signature) (if *my-client-signature* *my-client-signature* (let ((sig (server:mk-signature))) (set! *my-client-signature* sig) *my-client-signature*))) ;; kind start up of servers, wait 40 seconds before allowing another server for a given ;; run-id to be launched |
︙ | ︙ | |||
500 501 502 503 504 505 506 | (duty-cycle (configf:lookup-number *configdat* "server" "sync-duty-cycle" default: default-duty-cycle)) (last-sync-seconds 10) ;; we will adjust this to a measurement and delay last-sync-seconds * (1 - duty-cycle) (calculate-off-time (lambda (work-duration duty-cycle) (* (/ (- 1 duty-cycle) duty-cycle) last-sync-seconds))) (off-time min-intersync-delay) ;; adjusted in closure below. (do-a-sync (lambda () | | | 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 | (duty-cycle (configf:lookup-number *configdat* "server" "sync-duty-cycle" default: default-duty-cycle)) (last-sync-seconds 10) ;; we will adjust this to a measurement and delay last-sync-seconds * (1 - duty-cycle) (calculate-off-time (lambda (work-duration duty-cycle) (* (/ (- 1 duty-cycle) duty-cycle) last-sync-seconds))) (off-time min-intersync-delay) ;; adjusted in closure below. (do-a-sync (lambda () #;(BB> "Start do-a-sync with fork-to-background="fork-to-background" persist-until-sync="persist-until-sync) (let* ((finalres (let retry-loop ((num-tries 0)) (if (common:simple-file-lock lockfile) (begin (cond ((not (or fork-to-background persist-until-sync)) (debug:print 0 *default-log-port* "INFO: syncer thread sleeping for max of (server.minimum-intersync-delay="min-intersync-delay |
︙ | ︙ | |||
546 547 548 549 550 551 552 | (else (system (conc "/bin/cp "sync-log" "sync-log".fail")) (debug:print 0 *default-log-port* "ERROR: ["(common:human-time)"] Sync failed. See log at "sync-log".fail") (if (file-exists? (conc mtdbfile ".backup")) (system (conc "/bin/cp "mtdbfile ".backup " mtdbfile))) #f)))) (common:simple-file-release-lock lockfile) | | | | | 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 | (else (system (conc "/bin/cp "sync-log" "sync-log".fail")) (debug:print 0 *default-log-port* "ERROR: ["(common:human-time)"] Sync failed. See log at "sync-log".fail") (if (file-exists? (conc mtdbfile ".backup")) (system (conc "/bin/cp "mtdbfile ".backup " mtdbfile))) #f)))) (common:simple-file-release-lock lockfile) #;(BB> "released lockfile: " lockfile) #;(when (common:file-exists? lockfile) (BB> "DID NOT ACTUALLY RELEASE LOCKFILE")) res2) ;; end let );; end begin ;; else (cond (persist-until-sync (thread-sleep! 1) (debug:print 1 *default-log-port* "INFO: ["(common:human-time)"] pid="(current-process-id)" other SYNC in progress; we're in a fork-to-background so we need to succeed. Let's wait a jiffy and and try again. num-tries="num-tries" (waiting for lockfile="lockfile" to disappear)") (retry-loop (add1 num-tries))) (else (thread-sleep! (max off-time (+ last-sync-seconds min-intersync-delay))) (debug:print 1 *default-log-port* "INFO: ["(common:human-time)"] pid="(current-process-id)" other SYNC in progress; not syncing.") 'parallel-sync-in-progress)) ) ;; end if got lockfile ) )) #;(BB> "End do-a-sync with fork-to-background="fork-to-background" persist-until-sync="persist-until-sync" and result="finalres) finalres) ) ;; end lambda )) do-a-sync)) (define (server:writable-watchdog-bruteforce dbstruct) (thread-sleep! 1) ;; delay for startup |
︙ | ︙ |