Index: rpc-transport.scm
==================================================================
--- rpc-transport.scm
+++ rpc-transport.scm
@@ -239,20 +239,32 @@
       (vector-set! vec 5 (current-seconds))
       (begin
 	(print-call-chain (current-error-port))
 	(debug:print-error 0 *default-log-port* "call to rpc-transport:server-dat-update-last-access with non-vector!!"))))
 
+
+(define *api-exec-ht* (make-hash-table))
+
+;; let's see if caching the rpc stub curbs thread-profusion on server side
+(define (rpc-transport:get-api-exec iface port)
+  (let* ((lu (hash-table-ref/default *api-exec-ht* '(iface . port) #f)))
+    (if lu
+        lu
+        (let ((res (rpc:procedure 'api-exec iface port)))
+          (hash-table-set! *api-exec-ht* '(iface . port) res)
+          res))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; this client-side procedure makes rpc call to server and returns result
 ;;
 (define (rpc-transport:client-api-send-receive run-id serverdat cmd params #!key (numretries 3))
+  (if (not (vector? serverdat))
+      (BB> "WHAT?? for run-id="run-id", serverdat="serverdat))
   (let* ((iface (rpc-transport:server-dat-get-iface serverdat))
          (port  (rpc-transport:server-dat-get-port serverdat))
          (res #f)
-         (run-remote (rpc:procedure 'rpc-transport:autoremote iface port))
-         (api-exec (rpc:procedure 'api-exec iface port))
+         (api-exec (rpc-transport:get-api-exec iface port))  
          (send-receive (lambda ()
                          (tcp-buffer-size 0)
                          (set! res (retry-thunk
                                     (lambda ()
                                       (condition-case
@@ -380,11 +392,11 @@
     (set! db *inmemdb*)
 
     (debug:print 0 *default-log-port* "Server started on " host:port)
     
 
-    (thread-sleep! 2)
+    (thread-sleep! 4)
     (if (rpc-transport:self-test run-id ipaddrstr portnum)
         (debug:print 0 *default-log-port* "INFO: rpc self test passed!")
         (begin
           (debug:print 0 *default-log-port* "Error: rpc listener did not pass self test.  Shutting down.  On: " host:port)
           (exit)))
@@ -486,12 +498,12 @@
                         (debug:print-info 0 *default-log-port* "Server continuing, seconds since last db access: " (- (current-seconds) last-access)))
                     ;;
                     ;; Consider implementing some smarts here to re-insert the record or kill self is
                     ;; the db indicates so
                     ;;
-                    ;; (if (tasks:server-am-i-the-server? tdb run-id)
-                    ;;     (tasks:server-set-state! tdb server-id "running"))
+                    (if (tasks:bb-server-am-i-the-server? run-id)
+                        (tasks:bb-server-set-state! server-id "running"))
                     ;;
                     (loop 0 bad-sync-count))
                   (begin
                     (BB> "SERVER SHUTDOWN CALLED!  last-access="last-access" current-seconds="(current-seconds)" server-timeout="server-timeout)
                     (rpc-transport:server-shutdown server-id rpc:listener)))))
@@ -515,11 +527,11 @@
   
 (define (rpc-transport:ping run-id host port)
   (handle-exceptions
    exn
    (begin
-     (print "SERVER_NOT_FOUND")
+     (print "SERVER_NOT_FOUND exn="exn)
      (exit 1))
    (let ((login-res ((rpc:procedure 'server:login host port) *toppath*)))
      (if login-res
 	 (begin
 	   (print "LOGIN_OK")

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -199,12 +199,14 @@
 	(let* ((transport-type (rmt:run-id->transport-type run-id))
                (res (case transport-type
 		     ((http)(server:ping-server run-id 
 						(tasks:hostinfo-get-interface server)
 						(tasks:hostinfo-get-port      server)))
-                     ((rpc) ((rpc:procedure 'server:login (tasks:hostinfo-get-interface server) (tasks:hostinfo-get-port      server)) *toppath*))
-                     
+                     ((rpc) (rpc-transport:ping  run-id 
+                                                 (tasks:hostinfo-get-interface server)
+                                                 (tasks:hostinfo-get-port      server)))
+                    
                      (else  
                       (debug:print-error 0 *default-log-port* "(5) Transport [" transport-type
                                          "] specified for run-id [" run-id
                                          "] is not implemented in rmt:send-receive.  Cannot proceed.")
                       (exit 1)))))