DEVEL15-kill-ubik-pthread-env-20080718

[openafs.git] / src / ubik / disk.c

diff --git a/src/ubik/disk.c b/src/ubik/disk.c
index 89b8303..a32f7c5 100644 (file)
--- a/src/ubik/disk.c
+++ b/src/ubik/disk.c
@@ -21,13 +21,7 @@ RCSID
 #include <netinet/in.h>
 #endif
 #include <errno.h>
-#ifdef HAVE_STRING_H
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
 #include <lock.h>
 #include <rx/xdr.h>
 
@@ -134,7 +128,7 @@ udisk_LogOpcode(struct ubik_dbase *adbase, afs_int32 aopcode, int async)
     /* setup data and do write */
     aopcode = htonl(aopcode);
     code =
-       (*adbase->write) (adbase, LOGFILE, &aopcode, ustat.size,
+       (*adbase->write) (adbase, LOGFILE, (char *)&aopcode, ustat.size,
                          sizeof(afs_int32));
     if (code != sizeof(afs_int32))
        return UIOERROR;
@@ -167,7 +161,7 @@ udisk_LogEnd(struct ubik_dbase *adbase, struct ubik_version *aversion)
 
     /* do write */
     code =
-       (*adbase->write) (adbase, LOGFILE, data, ustat.size,
+       (*adbase->write) (adbase, LOGFILE, (char *)data, ustat.size,
                          3 * sizeof(afs_int32));
     if (code != 3 * sizeof(afs_int32))
        return UIOERROR;
@@ -198,7 +192,7 @@ udisk_LogTruncate(struct ubik_dbase *adbase, afs_int32 afile,
 
     /* do write */
     code =
-       (*adbase->write) (adbase, LOGFILE, data, ustat.size,
+       (*adbase->write) (adbase, LOGFILE, (char *)data, ustat.size,
                          3 * sizeof(afs_int32));
     if (code != 3 * sizeof(afs_int32))
        return UIOERROR;
@@ -229,7 +223,7 @@ udisk_LogWriteData(struct ubik_dbase *adbase, afs_int32 afile, char *abuffer,
 
     /* write header */
     code =
-       (*adbase->write) (adbase, LOGFILE, data, lpos, 4 * sizeof(afs_int32));
+       (*adbase->write) (adbase, LOGFILE, (char *)data, lpos, 4 * sizeof(afs_int32));
     if (code != 4 * sizeof(afs_int32))
        return UIOERROR;
     lpos += 4 * sizeof(afs_int32);
@@ -518,7 +512,7 @@ DRelease(char *ap, int flag)
 
     if (!ap)
        return;
-    index = (ap - (char *)BufferData) >> UBIK_LOGPAGESIZE;
+    index = (int)(ap - (char *)BufferData) >> UBIK_LOGPAGESIZE;
     bp = &(Buffers[index]);
     bp->lockers--;
     if (flag)
@@ -804,8 +798,11 @@ udisk_commit(struct ubik_trans *atrans)
        }
 
        dbase->version.counter++;       /* bump commit count */
+#ifdef AFS_PTHREAD_ENV
+       assert(pthread_cond_broadcast(&dbase->version_cond) == 0);
+#else
        LWP_NoYieldSignal(&dbase->version);
-
+#endif
        code = udisk_LogEnd(dbase, &dbase->version);
        if (code) {
            dbase->version.counter--;
@@ -921,6 +918,10 @@ udisk_end(struct ubik_trans *atrans)
     free(atrans);
 
     /* Wakeup any writers waiting in BeginTrans() */
+#ifdef AFS_PTHREAD_ENV
+       assert(pthread_cond_broadcast(&dbase->flags_cond) == 0);
+#else
     LWP_NoYieldSignal(&dbase->flags);
+#endif
     return 0;
 }