--- libaitrpc/src/srv.c	2015/07/19 23:38:09	1.27.2.3
+++ libaitrpc/src/srv.c	2015/07/22 12:49:10	1.27.2.5
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.27.2.3 2015/07/19 23:38:09 misho Exp $
+* $Id: srv.c,v 1.27.2.5 2015/07/22 12:49:10 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -1167,7 +1167,7 @@ end:
 static void *
 flushBLOB(sched_task_t *task)
 {
-#ifndef atomic_load_acq_ptr
+#ifdef atomic_load_acq_ptr
 	uintptr_t sigArg = atomic_load_acq_ptr(&_glSigArg);
 #else
 	uintptr_t sigArg = *((volatile uintptr_t*) &_glSigArg);
@@ -1379,10 +1379,10 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 
 	srv->srv_blob.kill = 1;
 
-	schedEnd(&srv->srv_blob.root);
-
 	if (srv->srv_blob.server.cli_sa.sa.sa_family == AF_LOCAL)
 		unlink(srv->srv_blob.server.cli_sa.sun.sun_path);
+
+	schedEnd(&srv->srv_blob.root);
 }
 
 /*
@@ -1413,7 +1413,7 @@ rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
 		/* disabled kqueue support in libaitsched */
 		struct sigaction sa;
 
-#ifndef atomic_store_rel_ptr
+#ifdef atomic_store_rel_ptr
 		atomic_store_rel_ptr(&_glSigArg, (uintptr_t) srv);
 #else
 		*((volatile uintptr_t*) &_glSigArg) = (uintptr_t) srv;
@@ -1607,16 +1607,16 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
 	/* if send kill to blob server */
 	rpc_srv_endBLOBServer(*psrv);
 	/* wait for BLOB server done */
-	while ((*psrv)->srv_blob.root)
+	while (*(&(*psrv)->srv_blob.root))
 		usleep(1000);
 
 	(*psrv)->srv_kill = 1;
 	sleep(RPC_SCHED_POLLING);
 
-	schedEnd(&(*psrv)->srv_root);
-
 	if ((*psrv)->srv_server.cli_sa.sa.sa_family == AF_LOCAL)
 		unlink((*psrv)->srv_server.cli_sa.sun.sun_path);
+
+	schedEnd(&(*psrv)->srv_root);
 
 	pthread_mutex_destroy(&(*psrv)->srv_funcs.mtx);
 	e_free(*psrv);