rx_multi: free the quantity of memory we allocated

[openafs.git] / src / rx / rx_multi.c

diff --git a/src/rx/rx_multi.c b/src/rx/rx_multi.c
index 83dddb2..85cca41 100644 (file)
--- a/src/rx/rx_multi.c
+++ b/src/rx/rx_multi.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
- * 
+ *
  * This software has been released under the terms of the IBM Public
  * License.  For details, see the LICENSE file in the top-level source
  * directory or online at http://www.openafs.org/dl/license10.html
@@ -10,16 +10,15 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-RCSID
-    ("$Header$");
-
 #ifdef KERNEL
-#include "afs/sysincludes.h"
-#include "rx/rx.h"
+# include "afs/sysincludes.h"
 #else /* KERNEL */
-# include "rx.h"
+# include <roken.h>
+# include <afs/opr.h>
 #endif /* KERNEL */
 
+#include "rx.h"
+
 /*
  * multi.c and multi.h, together with some rxgen hooks, provide a way of
  * making multiple, but similar, rx calls to multiple hosts simultaneously
@@ -39,20 +38,19 @@ multi_Init(struct rx_connection **conns, int nConns)
      * a process stack will not be accessible to other processes
      */
 
-    calls = (struct rx_call **)osi_Alloc(sizeof(struct rx_call *) * nConns);
-    ready = (short *)osi_Alloc(sizeof(short *) * nConns);
-    mh = (struct multi_handle *)osi_Alloc(sizeof(struct multi_handle));
+    calls = osi_Alloc(sizeof(struct rx_call *) * nConns);
+    ready = osi_Alloc(sizeof(short) * nConns);
+    mh = osi_Alloc(sizeof(struct multi_handle));
     if (!calls || !ready || !mh)
        osi_Panic("multi_Rx: no mem\n");
+    memset(mh, 0, sizeof(struct multi_handle));
     mh->calls = calls;
     mh->nextReady = mh->firstNotReady = mh->ready = ready;
     mh->nReady = 0;
     mh->nConns = nConns;
 
-#ifdef RX_ENABLE_LOCKS
     MUTEX_INIT(&mh->lock, "rx_multi_lock", MUTEX_DEFAULT, 0);
     CV_INIT(&mh->cv, "rx_multi_cv", CV_DEFAULT, 0);
-#endif /* RX_ENABLE_LOCKS */
     for (i = 0; i < nConns; i++) {
        struct rx_call *call;
        call = mh->calls[i] = rx_NewCall(conns[i]);
@@ -68,14 +66,10 @@ multi_Select(struct multi_handle *mh)
     int index;
     SPLVAR;
     NETPRI;
-#ifdef RX_ENABLE_LOCKS
     MUTEX_ENTER(&mh->lock);
-#endif /* RX_ENABLE_LOCKS */
     while (mh->nextReady == mh->firstNotReady) {
        if (mh->nReady == mh->nConns) {
-#ifdef RX_ENABLE_LOCKS
            MUTEX_EXIT(&mh->lock);
-#endif /* RX_ENABLE_LOCKS */
            USERPRI;
            return -1;
        }
@@ -87,9 +81,7 @@ multi_Select(struct multi_handle *mh)
     }
     index = *(mh->nextReady);
     (mh->nextReady) += 1;
-#ifdef RX_ENABLE_LOCKS
     MUTEX_EXIT(&mh->lock);
-#endif /* RX_ENABLE_LOCKS */
     USERPRI;
     return index;
 }
@@ -100,17 +92,15 @@ multi_Ready(struct rx_call *call, void *amh,
            int index)
 {
     struct multi_handle *mh = (struct multi_handle *)amh;
-#ifdef RX_ENABLE_LOCKS
     MUTEX_ENTER(&mh->lock);
-#endif /* RX_ENABLE_LOCKS */
     *mh->firstNotReady++ = index;
     mh->nReady++;
 #ifdef RX_ENABLE_LOCKS
     CV_SIGNAL(&mh->cv);
-    MUTEX_EXIT(&mh->lock);
 #else /* RX_ENABLE_LOCKS */
     osi_rxWakeup(mh);
 #endif /* RX_ENABLE_LOCKS */
+    MUTEX_EXIT(&mh->lock);
 }
 
 /* Called when the multi rx call is over, or when the user aborts it (by using the macro multi_Abort) */
@@ -124,12 +114,10 @@ multi_Finalize(struct multi_handle *mh)
        if (call)
            rx_EndCall(call, RX_USER_ABORT);
     }
-#ifdef RX_ENABLE_LOCKS
     MUTEX_DESTROY(&mh->lock);
     CV_DESTROY(&mh->cv);
-#endif /* RX_ENABLE_LOCKS */
     osi_Free(mh->calls, sizeof(struct rx_call *) * nCalls);
-    osi_Free(mh->ready, sizeof(short *) * nCalls);
+    osi_Free(mh->ready, sizeof(short) * nCalls);
     osi_Free(mh, sizeof(struct multi_handle));
 }
 
@@ -144,11 +132,9 @@ multi_Finalize_Ignore(struct multi_handle *mh)
        if (call)
            rx_EndCall(call, 0);
     }
-#ifdef RX_ENABLE_LOCKS
     MUTEX_DESTROY(&mh->lock);
     CV_DESTROY(&mh->cv);
-#endif /* RX_ENABLE_LOCKS */
     osi_Free(mh->calls, sizeof(struct rx_call *) * nCalls);
-    osi_Free(mh->ready, sizeof(short *) * nCalls);
+    osi_Free(mh->ready, sizeof(short) * nCalls);
     osi_Free(mh, sizeof(struct multi_handle));
 }