X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Finit.c;h=db588dfb626d206bd46e7e56e3be3fcfc596192b;hb=f0888d12d9b88b1a10becab60de72c7b5c9615f1;hp=0b7142586916d8a4196bfb753e6309d908d57622;hpb=aec45c6274bffc92fc1595a95d043e8aae292451;p=deb_libnfs.git diff --git a/lib/init.c b/lib/init.c index 0b71425..db588df 100644 --- a/lib/init.c +++ b/lib/init.c @@ -1,7 +1,10 @@ /* Copyright (C) 2010 by Ronnie Sahlberg - + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -49,6 +52,7 @@ struct rpc_context *rpc_init_context(void) { struct rpc_context *rpc; static uint32_t salt = 0; + unsigned int i; rpc = malloc(sizeof(struct rpc_context)); if (rpc == NULL) { @@ -84,7 +88,8 @@ struct rpc_context *rpc_init_context(void) rpc->gid = getgid(); #endif rpc_reset_queue(&rpc->outqueue); - rpc_reset_queue(&rpc->waitpdu); + for (i = 0; i < HASHES; i++) + rpc_reset_queue(&rpc->waitpdu[i]); return rpc; } @@ -158,6 +163,7 @@ char *rpc_get_error(struct rpc_context *rpc) void rpc_error_all_pdus(struct rpc_context *rpc, char *error) { struct rpc_pdu *pdu, *next; + unsigned int i; assert(rpc->magic == RPC_CONTEXT_MAGIC); @@ -168,12 +174,16 @@ void rpc_error_all_pdus(struct rpc_context *rpc, char *error) } rpc->outqueue.tail = NULL; - while((pdu = rpc->waitpdu.head) != NULL) { - pdu->cb(rpc, RPC_STATUS_ERROR, error, pdu->private_data); - rpc->waitpdu.head = pdu->next; - rpc_free_pdu(rpc, pdu); + for (i = 0; i < HASHES; i++) { + struct rpc_queue *q = &rpc->waitpdu[i]; + + while((pdu = q->head) != NULL) { + pdu->cb(rpc, RPC_STATUS_ERROR, error, pdu->private_data); + q->head = pdu->next; + rpc_free_pdu(rpc, pdu); + } + q->tail = NULL; } - rpc->waitpdu.tail = NULL; } static void rpc_free_fragment(struct rpc_fragment *fragment) @@ -215,25 +225,31 @@ int rpc_add_fragment(struct rpc_context *rpc, char *data, uint64_t size) } memcpy(fragment->data, data, fragment->size); - SLIST_ADD_END(&rpc->fragments, fragment); + LIBNFS_LIST_ADD_END(&rpc->fragments, fragment); return 0; } void rpc_destroy_context(struct rpc_context *rpc) { struct rpc_pdu *pdu; + unsigned int i; assert(rpc->magic == RPC_CONTEXT_MAGIC); while((pdu = rpc->outqueue.head) != NULL) { pdu->cb(rpc, RPC_STATUS_CANCEL, NULL, pdu->private_data); - rpc->outqueue.head = pdu->next; + LIBNFS_LIST_REMOVE(&rpc->outqueue.head, pdu); rpc_free_pdu(rpc, pdu); } - while((pdu = rpc->waitpdu.head) != NULL) { - pdu->cb(rpc, RPC_STATUS_CANCEL, NULL, pdu->private_data); - rpc->outqueue.head = pdu->next; - rpc_free_pdu(rpc, pdu); + + for (i = 0; i < HASHES; i++) { + struct rpc_queue *q = &rpc->waitpdu[i]; + + while((pdu = q->head) != NULL) { + pdu->cb(rpc, RPC_STATUS_CANCEL, NULL, pdu->private_data); + LIBNFS_LIST_REMOVE(&q->head, pdu); + rpc_free_pdu(rpc, pdu); + } } rpc_free_all_fragments(rpc);