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 ee8a149..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>
 
@@ -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;
 }