DEVEL15-kill-ubik-pthread-env-20080718

[openafs.git] / src / budb / db_dump.c

diff --git a/src/budb/db_dump.c b/src/budb/db_dump.c
index 808c65e..983b1d2 100644 (file)
--- a/src/budb/db_dump.c
+++ b/src/budb/db_dump.c
@@ -73,7 +73,7 @@ canWrite(fid)
     while (dumpSyncPtr->ds_bytes > 0) {
        if (dumpSyncPtr->ds_readerStatus == DS_WAITING) {
            dumpSyncPtr->ds_readerStatus = 0;
-#if defined(AFS_PTHREAD_ENV) && defined(UBIK_PTHREAD_ENV)
+#ifdef AFS_PTHREAD_ENV
            assert(pthread_cond_broadcast(&dumpSyncPtr->ds_readerStatus_cond) == 0);
 #else
            code = LWP_SignalProcess(&dumpSyncPtr->ds_readerStatus);
@@ -83,7 +83,7 @@ canWrite(fid)
        }
        dumpSyncPtr->ds_writerStatus = DS_WAITING;
        ReleaseWriteLock(&dumpSyncPtr->ds_lock);
-#if defined(AFS_PTHREAD_ENV) && defined(UBIK_PTHREAD_ENV)
+#ifdef AFS_PTHREAD_ENV
        assert(pthread_mutex_lock(&dumpSyncPtr->ds_writerStatus_mutex) == 0);
        assert(pthread_cond_wait(&dumpSyncPtr->ds_writerStatus_cond, &dumpSyncPtr->ds_writerStatus_mutex) == 0);
        assert(pthread_mutex_unlock(&dumpSyncPtr->ds_writerStatus_mutex) == 0);
@@ -113,7 +113,7 @@ haveWritten(nbytes)
     dumpSyncPtr->ds_bytes += nbytes;
     if (dumpSyncPtr->ds_readerStatus == DS_WAITING) {
        dumpSyncPtr->ds_readerStatus = 0;
-#if defined(AFS_PTHREAD_ENV) && defined(UBIK_PTHREAD_ENV)
+#ifdef AFS_PTHREAD_ENV
        assert(pthread_cond_broadcast(&dumpSyncPtr->ds_readerStatus_cond) == 0);
 #else
        code = LWP_SignalProcess(&dumpSyncPtr->ds_readerStatus);
@@ -141,7 +141,7 @@ doneWriting(error)
        LogDebug(4, "doneWriting: waiting for Reader\n");
        dumpSyncPtr->ds_writerStatus = DS_WAITING;
        ReleaseWriteLock(&dumpSyncPtr->ds_lock);
-#if defined(AFS_PTHREAD_ENV) && defined(UBIK_PTHREAD_ENV)
+#ifdef AFS_PTHREAD_ENV
        assert(pthread_mutex_lock(&dumpSyncPtr->ds_writerStatus_mutex) == 0);
        assert(pthread_cond_wait(&dumpSyncPtr->ds_writerStatus_cond, &dumpSyncPtr->ds_writerStatus_mutex) == 0);
        assert(pthread_mutex_unlock(&dumpSyncPtr->ds_writerStatus_mutex) == 0);
@@ -159,7 +159,7 @@ doneWriting(error)
     else
        dumpSyncPtr->ds_writerStatus = DS_DONE;
     dumpSyncPtr->ds_readerStatus = 0;
-#if defined(AFS_PTHREAD_ENV) && defined(UBIK_PTHREAD_ENV)
+#ifdef AFS_PTHREAD_ENV
     assert(pthread_cond_broadcast(&dumpSyncPtr->ds_readerStatus_cond) == 0);
 #else
     code = LWP_NoYieldSignal(&dumpSyncPtr->ds_readerStatus);