Optimisations to the pdu queues

[deb_libnfs.git] / lib / init.c

diff --git a/lib/init.c b/lib/init.c
index 93d1db8b088b3780601d5251b63fb30d71a0e28e..0b7142586916d8a4196bfb753e6309d908d57622 100644 (file)
--- a/lib/init.c
+++ b/lib/init.c
@@ -76,13 +76,15 @@ struct rpc_context *rpc_init_context(void)
        salt += 0x01000000;
        rpc->fd = -1;
        rpc->tcp_syncnt = RPC_PARAM_UNDEFINED;
-#ifdef WIN32
+#if defined(WIN32) || defined(ANDROID)
        rpc->uid = 65534;
        rpc->gid = 65534;
 #else
        rpc->uid = getuid();
        rpc->gid = getgid();
 #endif
+       rpc_reset_queue(&rpc->outqueue);
+       rpc_reset_queue(&rpc->waitpdu);
 
        return rpc;
 }
@@ -132,16 +134,18 @@ void rpc_set_gid(struct rpc_context *rpc, int gid) {
 void rpc_set_error(struct rpc_context *rpc, char *error_string, ...)
 {
         va_list ap;
+       char *old_error_string = rpc->error_string;
 
        assert(rpc->magic == RPC_CONTEXT_MAGIC);
 
-       if (rpc->error_string != NULL) {
-               free(rpc->error_string);
-       }
         va_start(ap, error_string);
        rpc->error_string = malloc(1024);
        vsnprintf(rpc->error_string, 1024, error_string, ap);
         va_end(ap);
+
+       if (old_error_string != NULL) {
+               free(old_error_string);
+       }
 }
 
 char *rpc_get_error(struct rpc_context *rpc)
@@ -153,20 +157,23 @@ char *rpc_get_error(struct rpc_context *rpc)
 
 void rpc_error_all_pdus(struct rpc_context *rpc, char *error)
 {
-       struct rpc_pdu *pdu;
+       struct rpc_pdu *pdu, *next;
 
        assert(rpc->magic == RPC_CONTEXT_MAGIC);
 
-       while((pdu = rpc->outqueue) != NULL) {
+       while ((pdu = rpc->outqueue.head) != NULL) {
                pdu->cb(rpc, RPC_STATUS_ERROR, error, pdu->private_data);
-               SLIST_REMOVE(&rpc->outqueue, pdu);
+               rpc->outqueue.head = pdu->next;
                rpc_free_pdu(rpc, pdu);
        }
-       while((pdu = rpc->waitpdu) != NULL) {
+       rpc->outqueue.tail = NULL;
+
+       while((pdu = rpc->waitpdu.head) != NULL) {
                pdu->cb(rpc, RPC_STATUS_ERROR, error, pdu->private_data);
-               SLIST_REMOVE(&rpc->waitpdu, pdu);
+               rpc->waitpdu.head = pdu->next;
                rpc_free_pdu(rpc, pdu);
        }
+       rpc->waitpdu.tail = NULL;
 }
 
 static void rpc_free_fragment(struct rpc_fragment *fragment)
@@ -184,7 +191,7 @@ void rpc_free_all_fragments(struct rpc_context *rpc)
        while (rpc->fragments != NULL) {
              struct rpc_fragment *fragment = rpc->fragments;
 
-             SLIST_REMOVE(&rpc->fragments, fragment);
+             rpc->fragments = fragment->next;
              rpc_free_fragment(fragment);
        }
 }
@@ -218,14 +225,14 @@ void rpc_destroy_context(struct rpc_context *rpc)
 
        assert(rpc->magic == RPC_CONTEXT_MAGIC);
 
-       while((pdu = rpc->outqueue) != NULL) {
+       while((pdu = rpc->outqueue.head) != NULL) {
                pdu->cb(rpc, RPC_STATUS_CANCEL, NULL, pdu->private_data);
-               SLIST_REMOVE(&rpc->outqueue, pdu);
+               rpc->outqueue.head = pdu->next;
                rpc_free_pdu(rpc, pdu);
        }
-       while((pdu = rpc->waitpdu) != NULL) {
+       while((pdu = rpc->waitpdu.head) != NULL) {
                pdu->cb(rpc, RPC_STATUS_CANCEL, NULL, pdu->private_data);
-               SLIST_REMOVE(&rpc->waitpdu, pdu);
+               rpc->outqueue.head = pdu->next;
                rpc_free_pdu(rpc, pdu);
        }