Index: server.scm ================================================================== --- server.scm +++ server.scm @@ -45,11 +45,11 @@ (if port (vector (car lst) port) #f))) (let* ((rpc:listener (server:find-free-port-and-open (rpc:default-server-port))) (th1 (make-thread (cute (rpc:make-server rpc:listener) "rpc:server") 'rpc:server)) - (th2 (make-thread (lambda ()(db:updater)))) + ;; (th2 (make-thread (lambda ()(db:updater)))) (hostname (if (string=? "-" hostn) (get-host-name) hostn)) (ipaddrstr (if (string=? "-" hostn) (string-intersperse (map number->string (u8vector->list (hostname->ip hostname))) ".") @@ -136,16 +136,17 @@ (if (> queue-len 0) (begin (debug:print-info 0 "Queue not flushed, waiting ...") (loop (+ n 1))))) ))) + (db:updater) (thread-start! th1) ;; (debug:print 0 "Server started on port " (rpc:default-server-port) "...") - (thread-start! th2) + ;; (thread-start! th2) ;; (thread-join! th2) ;; return th2 for the calling process to do a join with - th2 + th1 )))) ;; rpc:server))) (define (server:keep-running db host:port) ;; if none running or if > 20 seconds since ;; server last used then start shutdown Index: utils/installall.sh ================================================================== --- utils/installall.sh +++ utils/installall.sh @@ -107,10 +107,11 @@ if ! [[ -e $PREFIX/bin/sqlite3 ]] ; then if [[ -e sqlite-autoconf-$SQLITE3_VERSION.tar.gz ]]; then tar xfz sqlite-autoconf-$SQLITE3_VERSION.tar.gz (cd sqlite-autoconf-$SQLITE3_VERSION;./configure --prefix=$PREFIX;make;make install) CSC_OPTIONS="-I$PREFIX/include -L$PREFIX/lib" chicken-install -prefix $DEPLOYTARG -deploy $PROX sqlite3 + CSC_OPTIONS="-I$PREFIX/include -L$PREFIX/lib" chicken-install $PROX sqlite3 fi fi # chicken-install $PROX sqlite3 @@ -159,13 +160,15 @@ # iup:1.0.2 CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" chicken-install $PROX -D no-library-checks canvas-draw CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" chicken-install $PROX -D no-library-checks -deploy -prefix $DEPLOYTARG canvas-draw # wget http://www.kernel.org/pub/linux/utils/util-linux/v2.22/util-linux-2.22.tar.gz -UTIL_LINUX=2.22 +# UTIL_LINUX=2.22 +UTIL_LINUX=2.20.1 if ! [[ -e util-linux-${UTIL_LINUX}.tar.gz ]] ; then - wget http://www.kernel.org/pub/linux/utils/util-linux/v${UTIL_LINUX}/util-linux-${UTIL_LINUX}.tar.gz + wget http://www.kiatoa.com/matt/util-linux-2.20.1.tar.gz + # wget http://www.kernel.org/pub/linux/utils/util-linux/v${UTIL_LINUX}/util-linux-${UTIL_LINUX}.tar.gz fi if [[ -e util-linux-${UTIL_LINUX}.tar.gz ]] ; then tar xfz util-linux-${UTIL_LINUX}.tar.gz cd util-linux-${UTIL_LINUX} mkdir -p build