[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r3200 - in GNUnet/src: applications/chat applications/datas
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r3200 - in GNUnet/src: applications/chat applications/datastore applications/dht/module applications/fs/fsui applications/fs/lib applications/fs/tools applications/rpc applications/tbench applications/template applications/testbed applications/tracekit applications/vpn transports util/os util/threads |
|
Date: |
Sun, 30 Jul 2006 21:32:26 -0700 (PDT) |
Author: grothoff
Date: 2006-07-30 21:32:21 -0700 (Sun, 30 Jul 2006)
New Revision: 3200
Modified:
GNUnet/src/applications/chat/gnunet-chat.c
GNUnet/src/applications/datastore/Makefile.am
GNUnet/src/applications/datastore/filter.c
GNUnet/src/applications/datastore/filter.h
GNUnet/src/applications/datastore/prefetch.c
GNUnet/src/applications/dht/module/cs.c
GNUnet/src/applications/dht/module/dht.c
GNUnet/src/applications/fs/fsui/file_info.c
GNUnet/src/applications/fs/fsui/fsui.c
GNUnet/src/applications/fs/lib/fslibtest.c
GNUnet/src/applications/fs/tools/gnunet-download.c
GNUnet/src/applications/fs/tools/gnunet-insert.c
GNUnet/src/applications/fs/tools/gnunet-unindex.c
GNUnet/src/applications/rpc/rpc.c
GNUnet/src/applications/tbench/tbench.c
GNUnet/src/applications/template/gnunet-template.c
GNUnet/src/applications/testbed/testbed.c
GNUnet/src/applications/tracekit/gnunet-tracekit.c
GNUnet/src/applications/vpn/gnunet-vpn.c
GNUnet/src/transports/http.c
GNUnet/src/transports/smtp.c
GNUnet/src/util/os/semaphoretest.c
GNUnet/src/util/threads/semaphoretest.c
GNUnet/src/util/threads/timertest.c
Log:
towards datastore, also sem-free is now sem-destroy
Modified: GNUnet/src/applications/chat/gnunet-chat.c
===================================================================
--- GNUnet/src/applications/chat/gnunet-chat.c 2006-07-31 04:19:56 UTC (rev
3199)
+++ GNUnet/src/applications/chat/gnunet-chat.c 2006-07-31 04:32:21 UTC (rev
3200)
@@ -192,7 +192,7 @@
}
closeSocketTemporarily(sock);
SEMAPHORE_DOWN(doneSem);
- SEMAPHORE_FREE(doneSem);
+ SEMAPHORE_DESTROY(doneSem);
PTHREAD_JOIN(&messageReceiveThread, &unused);
releaseClientSocket(sock);
Modified: GNUnet/src/applications/datastore/Makefile.am
===================================================================
--- GNUnet/src/applications/datastore/Makefile.am 2006-07-31 04:19:56 UTC
(rev 3199)
+++ GNUnet/src/applications/datastore/Makefile.am 2006-07-31 04:32:21 UTC
(rev 3200)
@@ -2,13 +2,9 @@
plugindir = $(libdir)/GNUnet
-LDADD = \
- $(top_builddir)/src/util/libgnunetutil.la
-
plugin_LTLIBRARIES = \
libgnunetmodule_datastore.la
-
libgnunetmodule_datastore_la_SOURCES = \
filter.c filter.h \
prefetch.c prefetch.h \
@@ -16,5 +12,6 @@
libgnunetmodule_datastore_la_LDFLAGS = \
-export-dynamic -avoid-version -module
libgnunetmodule_datastore_la_LIBADD = \
- $(LDADD)
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/util/containers/libgnunetutil_containers.la
Modified: GNUnet/src/applications/datastore/filter.c
===================================================================
--- GNUnet/src/applications/datastore/filter.c 2006-07-31 04:19:56 UTC (rev
3199)
+++ GNUnet/src/applications/datastore/filter.c 2006-07-31 04:32:21 UTC (rev
3200)
@@ -24,24 +24,35 @@
* @author Christian Grothoff
*/
-#include "platform.h"
+#include "gnunet_directories.h"
#include "gnunet_util.h"
+#include "gnunet_util_containers.h"
#include "filter.h"
+#include "platform.h"
/**
* Filter.
*/
static struct Bloomfilter * filter;
-static char * getFilterName() {
+static char * getFilterName(struct GE_Context * ectx,
+ struct GC_Configuration * cfg) {
char * fn;
char * bf;
- fn = getFileName("FS",
- "DIR",
- _("Configuration must specify directory for "
- "FS data in section `%s' under `%s'.\n"));
- mkdirp(fn);
+ if (-1 == GC_get_configuration_value_string(cfg,
+ "FS",
+ "DIR",
+ VAR_DAEMON_DIRECTORY "/fs",
+ &bf))
+ return NULL;
+ fn = string_expandFileName(ectx, bf);
+ FREE(bf);
+ if (OK != disk_directory_create(ectx,
+ fn)) {
+ FREE(fn);
+ return NULL;
+ }
bf = MALLOC(strlen(fn)+
strlen("/bloomfilter")+1);
strcpy(bf, fn);
@@ -50,22 +61,28 @@
return bf;
}
-int initFilters() {
+int initFilters(struct GE_Context * ectx,
+ struct GC_Configuration * cfg) {
char * bf;
- unsigned int quota; /* in kb */
- unsigned int * qt;
+ unsigned long long quota; /* in kb */
unsigned int bf_size;
- bf = getFilterName();
-
- /* read existing quota, check if it changed */
- qt = NULL;
- quota = getConfigurationInt("FS",
- "QUOTA") * 1024;
-
+ if (-1 == GC_get_configuration_value_number(cfg,
+ "FS",
+ "QUOTA",
+ 0,
+ ((unsigned long long)-1)/1024,
+ 1024,
+ "a))
+ return SYSERR;
+ quota *= 1024;
bf_size = quota/8/32; /* 8 bit per entry, 1 bit per 32 kb in DB */
+ bf = getFilterName(ectx, cfg);
+ if (bf == NULL)
+ return SYSERR;
filter
- = loadBloomfilter(bf,
+ = loadBloomfilter(ectx,
+ bf,
bf_size,
5); /* approx. 3% false positives at max use */
FREE(bf);
@@ -79,11 +96,12 @@
freeBloomfilter(filter);
}
-void deleteFilter() {
+void deleteFilter(struct GE_Context * ectx,
+ struct GC_Configuration * cfg) {
char * fn;
GE_ASSERT(ectx, filter == NULL);
- fn = getFilterName();
+ fn = getFilterName(ectx, cfg);
UNLINK(fn);
FREE(fn);
}
Modified: GNUnet/src/applications/datastore/filter.h
===================================================================
--- GNUnet/src/applications/datastore/filter.h 2006-07-31 04:19:56 UTC (rev
3199)
+++ GNUnet/src/applications/datastore/filter.h 2006-07-31 04:32:21 UTC (rev
3200)
@@ -26,12 +26,16 @@
#ifndef FILTER_H
#define FILTER_H
-int initFilters();
+#include "gnunet_util.h"
-void doneFilters();
+int initFilters(struct GE_Context * ectx,
+ struct GC_Configuration * cfg);
-void deleteFilter();
+void doneFilters(void);
+void deleteFilter(struct GE_Context * ectx,
+ struct GC_Configuration * cfg);
+
void makeAvailable(const HashCode512 * key);
void makeUnavailable(const HashCode512 * key);
Modified: GNUnet/src/applications/datastore/prefetch.c
===================================================================
--- GNUnet/src/applications/datastore/prefetch.c 2006-07-31 04:19:56 UTC
(rev 3199)
+++ GNUnet/src/applications/datastore/prefetch.c 2006-07-31 04:32:21 UTC
(rev 3200)
@@ -63,21 +63,21 @@
* Semaphore on which the RCB acquire thread waits
* if the RCB buffer is full.
*/
-static Semaphore * acquireMoreSignal;
+static struct SEMAPHORE * acquireMoreSignal;
-static Semaphore * doneSignal;
+static struct SEMAHPORE * doneSignal;
/**
* Lock for the RCB buffer.
*/
-static Mutex lock;
+static struct MUTEX * lock;
/**
* Highest index in RCB that is valid.
*/
static int rCBPos = 0;
-static PTHREAD_T gather_thread;
+static struct PTHREAD * gather_thread;
static int aquire(const HashCode512 * key,
@@ -90,14 +90,14 @@
SEMAPHORE_DOWN(acquireMoreSignal);
if (doneSignal != NULL)
return SYSERR;
- MUTEX_LOCK(&lock);
+ MUTEX_LOCK(lock);
load = 0;
while (randomContentBuffer[rCBPos].value != NULL) {
rCBPos = (rCBPos + 1) % RCB_SIZE;
load++;
if (load > RCB_SIZE) {
GE_BREAK(ectx, 0);
- MUTEX_UNLOCK(&lock);
+ MUTEX_UNLOCK(lock);
return SYSERR;
}
}
@@ -113,7 +113,7 @@
memcpy(randomContentBuffer[rCBPos].value,
value,
ntohl(value->size));
- MUTEX_UNLOCK(&lock);
+ MUTEX_UNLOCK(lock);
load = getCPULoad(); /* FIXME: should use 'IO load' here */
if (load < 10)
load = 10; /* never sleep less than 500 ms */
@@ -170,7 +170,7 @@
minIdx = -1;
minDist = -1; /* max */
- MUTEX_LOCK(&lock);
+ MUTEX_LOCK(lock);
for (i=0;i<RCB_SIZE;i++) {
if (randomContentBuffer[i].value == NULL)
continue;
@@ -188,7 +188,7 @@
}
}
if (minIdx == -1) {
- MUTEX_UNLOCK(&lock);
+ MUTEX_UNLOCK(lock);
#if DEBUG_PREFETCH
GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Failed to find content in prefetch buffer\n");
@@ -216,7 +216,7 @@
randomContentBuffer[minIdx].value = NULL;
SEMAPHORE_UP(acquireMoreSignal);
}
- MUTEX_UNLOCK(&lock);
+ MUTEX_UNLOCK(lock);
return OK;
}
@@ -227,7 +227,7 @@
sizeof(ContentBuffer *)*RCB_SIZE);
acquireMoreSignal = SEMAPHORE_NEW(RCB_SIZE);
doneSignal = NULL;
- MUTEX_CREATE(&lock);
+ lock = MUTEX_CREATE();
if (0 != PTHREAD_CREATE(&gather_thread,
(PThreadMain)&rcbAcquire,
NULL,
@@ -242,12 +242,13 @@
doneSignal = SEMAPHORE_NEW(0);
SEMAPHORE_UP(acquireMoreSignal);
SEMAPHORE_DOWN(doneSignal);
- SEMAPHORE_FREE(acquireMoreSignal);
- SEMAPHORE_FREE(doneSignal);
+ SEMAPHORE_DESTROY(acquireMoreSignal);
+ SEMAPHORE_DESTROY(doneSignal);
PTHREAD_JOIN(&gather_thread, &unused);
for (i=0;i<rCBPos;i++)
FREENONNULL(randomContentBuffer[i].value);
- MUTEX_DESTROY(&lock);
+ MUTEX_DESTROY(lock);
+ lock = NULL;
}
/* end of prefetch.c */
Modified: GNUnet/src/applications/dht/module/cs.c
===================================================================
--- GNUnet/src/applications/dht/module/cs.c 2006-07-31 04:19:56 UTC (rev
3199)
+++ GNUnet/src/applications/dht/module/cs.c 2006-07-31 04:32:21 UTC (rev
3200)
@@ -385,9 +385,9 @@
csHandlersCount+1);
csHandlers[csHandlersCount-1] = ptr;
} else {
- SEMAPHORE_FREE(ptr->prerequest);
- SEMAPHORE_FREE(ptr->prereply);
- SEMAPHORE_FREE(ptr->postreply);
+ SEMAPHORE_DESTROY(ptr->prerequest);
+ SEMAPHORE_DESTROY(ptr->prereply);
+ SEMAPHORE_DESTROY(ptr->postreply);
FREE(ptr->store);
FREE(ptr);
}
@@ -431,9 +431,9 @@
ptr->status = SYSERR;
SEMAPHORE_UP(ptr->prereply);
SEMAPHORE_DOWN(ptr->prerequest);
- SEMAPHORE_FREE(ptr->prerequest);
- SEMAPHORE_FREE(ptr->prereply);
- SEMAPHORE_FREE(ptr->postreply);
+ SEMAPHORE_DESTROY(ptr->prerequest);
+ SEMAPHORE_DESTROY(ptr->prereply);
+ SEMAPHORE_DESTROY(ptr->postreply);
FREE(ptr->store);
FREE(ptr);
return sendAck(client,
Modified: GNUnet/src/applications/dht/module/dht.c
===================================================================
--- GNUnet/src/applications/dht/module/dht.c 2006-07-31 04:19:56 UTC (rev
3199)
+++ GNUnet/src/applications/dht/module/dht.c 2006-07-31 04:32:21 UTC (rev
3200)
@@ -1946,7 +1946,7 @@
/* stop all async RPCs */
for (i=fnc->rpcRepliesExpected-1;i>=0;i--)
rpcAPI->RPC_stop(fnc->rpc[i]);
- SEMAPHORE_FREE(fnc->signal);
+ SEMAPHORE_DESTROY(fnc->signal);
MUTEX_DESTROY(&fnc->lock);
/* Finally perform callbacks on collected k-best nodes. */
Modified: GNUnet/src/applications/fs/fsui/file_info.c
===================================================================
--- GNUnet/src/applications/fs/fsui/file_info.c 2006-07-31 04:19:56 UTC (rev
3199)
+++ GNUnet/src/applications/fs/fsui/file_info.c 2006-07-31 04:32:21 UTC (rev
3200)
@@ -137,7 +137,7 @@
}
FREE(fn);
IPC_SEMAPHORE_UP(sem);
- IPC_SEMAPHORE_FREE(sem);
+ IPC_SEMAPHORE_DESTROY(sem);
FREE(data);
FREE(suri);
}
@@ -159,7 +159,7 @@
fn);
FREE(fn);
IPC_SEMAPHORE_UP(sem);
- IPC_SEMAPHORE_FREE(sem);
+ IPC_SEMAPHORE_DESTROY(sem);
}
/**
@@ -202,13 +202,13 @@
IPC_SEMAPHORE_DOWN(sem);
if(0 != STAT(fn, &buf)) {
IPC_SEMAPHORE_UP(sem);
- IPC_SEMAPHORE_FREE(sem);
+ IPC_SEMAPHORE_DESTROY(sem);
return 0; /* no URI db */
}
fd = fileopen(fn, O_LARGEFILE | O_RDONLY);
if(fd == -1) {
IPC_SEMAPHORE_UP(sem);
- IPC_SEMAPHORE_FREE(sem);
+ IPC_SEMAPHORE_DESTROY(sem);
LOG_FILE_STRERROR(LOG_WARNING, "open", fn);
FREE(fn);
return SYSERR; /* error opening URI db */
@@ -219,7 +219,7 @@
LOG_FILE_STRERROR(LOG_WARNING, "mmap", fn);
FREE(fn);
IPC_SEMAPHORE_UP(sem);
- IPC_SEMAPHORE_FREE(sem);
+ IPC_SEMAPHORE_DESTROY(sem);
return SYSERR;
}
ret = buf.st_size;
@@ -263,7 +263,7 @@
CLOSE(fd);
FREE(fn);
IPC_SEMAPHORE_UP(sem);
- IPC_SEMAPHORE_FREE(sem);
+ IPC_SEMAPHORE_DESTROY(sem);
return SYSERR; /* iteration aborted */
}
}
@@ -276,7 +276,7 @@
CLOSE(fd);
FREE(fn);
IPC_SEMAPHORE_UP(sem);
- IPC_SEMAPHORE_FREE(sem);
+ IPC_SEMAPHORE_DESTROY(sem);
return rval;
FORMATERROR:
GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER, _("Deleted corrupt URI database
in `%s'."), STATE_NAME);
@@ -285,7 +285,7 @@
CLOSE(fd);
FREE(fn);
IPC_SEMAPHORE_UP(sem);
- IPC_SEMAPHORE_FREE(sem);
+ IPC_SEMAPHORE_DESTROY(sem);
FSUI_clearTrackedURIS();
return SYSERR;
}
Modified: GNUnet/src/applications/fs/fsui/fsui.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsui.c 2006-07-31 04:19:56 UTC (rev
3199)
+++ GNUnet/src/applications/fs/fsui/fsui.c 2006-07-31 04:32:21 UTC (rev
3200)
@@ -843,7 +843,7 @@
freeDownloadList(ctx->activeDownloads.child);
if (ctx->ipc != NULL) {
IPC_SEMAPHORE_UP(ctx->ipc);
- IPC_SEMAPHORE_FREE(ctx->ipc);
+ IPC_SEMAPHORE_DESTROY(ctx->ipc);
}
MUTEX_DESTROY(&ctx->lock);
FREE(ctx->name);
Modified: GNUnet/src/applications/fs/lib/fslibtest.c
===================================================================
--- GNUnet/src/applications/fs/lib/fslibtest.c 2006-07-31 04:19:56 UTC (rev
3199)
+++ GNUnet/src/applications/fs/lib/fslibtest.c 2006-07-31 04:32:21 UTC (rev
3200)
@@ -205,7 +205,7 @@
suspendCron();
delCronJob((CronJob) &abortSem, 0, closure.sem);
resumeCron();
- SEMAPHORE_FREE(closure.sem);
+ SEMAPHORE_DESTROY(closure.sem);
return closure.found;
}
Modified: GNUnet/src/applications/fs/tools/gnunet-download.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-download.c 2006-07-31 04:19:56 UTC
(rev 3199)
+++ GNUnet/src/applications/fs/tools/gnunet-download.c 2006-07-31 04:32:21 UTC
(rev 3200)
@@ -278,7 +278,7 @@
if (OK == ok)
SEMAPHORE_DOWN(signalFinished);
FSUI_stop(ctx);
- SEMAPHORE_FREE(signalFinished);
+ SEMAPHORE_DESTROY(signalFinished);
if ( (ok == OK) && (try_rename == YES) ) {
char * newname = ECRS_suggestFilename(filename);
Modified: GNUnet/src/applications/fs/tools/gnunet-insert.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-insert.c 2006-07-31 04:19:56 UTC
(rev 3199)
+++ GNUnet/src/applications/fs/tools/gnunet-insert.c 2006-07-31 04:32:21 UTC
(rev 3200)
@@ -733,7 +733,7 @@
SEMAPHORE_DOWN(exitSignal);
es = exitSignal;
exitSignal = NULL;
- SEMAPHORE_FREE(es);
+ SEMAPHORE_DESTROY(es);
/* shutdown */
FREE(filename);
Modified: GNUnet/src/applications/fs/tools/gnunet-unindex.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-unindex.c 2006-07-31 04:19:56 UTC
(rev 3199)
+++ GNUnet/src/applications/fs/tools/gnunet-unindex.c 2006-07-31 04:32:21 UTC
(rev 3200)
@@ -194,7 +194,7 @@
} else {
/* wait for completion */
SEMAPHORE_DOWN(exitSignal);
- SEMAPHORE_FREE(exitSignal);
+ SEMAPHORE_DESTROY(exitSignal);
}
FREE(filename);
FSUI_stop(ctx);
Modified: GNUnet/src/applications/rpc/rpc.c
===================================================================
--- GNUnet/src/applications/rpc/rpc.c 2006-07-31 04:19:56 UTC (rev 3199)
+++ GNUnet/src/applications/rpc/rpc.c 2006-07-31 04:32:21 UTC (rev 3200)
@@ -1216,7 +1216,7 @@
call);
MUTEX_UNLOCK (rpcLock);
SEMAPHORE_DOWN(cls.sem);
- SEMAPHORE_FREE(cls.sem);
+ SEMAPHORE_DESTROY(cls.sem);
RPC_STATUS(name, "completed synchronously", call);
return cls.ec;
}
Modified: GNUnet/src/applications/tbench/tbench.c
===================================================================
--- GNUnet/src/applications/tbench/tbench.c 2006-07-31 04:19:56 UTC (rev
3199)
+++ GNUnet/src/applications/tbench/tbench.c 2006-07-31 04:32:21 UTC (rev
3200)
@@ -368,8 +368,8 @@
0,
postsem);
resumeCron();
- SEMAPHORE_FREE(presem);
- SEMAPHORE_FREE(postsem);
+ SEMAPHORE_DESTROY(presem);
+ SEMAPHORE_DESTROY(postsem);
presem = NULL;
postsem = NULL;
Modified: GNUnet/src/applications/template/gnunet-template.c
===================================================================
--- GNUnet/src/applications/template/gnunet-template.c 2006-07-31 04:19:56 UTC
(rev 3199)
+++ GNUnet/src/applications/template/gnunet-template.c 2006-07-31 04:32:21 UTC
(rev 3200)
@@ -133,7 +133,7 @@
closeSocketTemporarily(sock);
SEMAPHORE_DOWN(doneSem);
- SEMAPHORE_FREE(doneSem);
+ SEMAPHORE_DESTROY(doneSem);
PTHREAD_JOIN(&messageReceiveThread, &unused);
releaseClientSocket(sock);
Modified: GNUnet/src/applications/testbed/testbed.c
===================================================================
--- GNUnet/src/applications/testbed/testbed.c 2006-07-31 04:19:56 UTC (rev
3199)
+++ GNUnet/src/applications/testbed/testbed.c 2006-07-31 04:32:21 UTC (rev
3200)
@@ -664,7 +664,7 @@
pi,
8*1024)) {
LOG_STRERROR(LOG_WARNING, "pthread_create");
- SEMAPHORE_FREE(pi->sem);
+ SEMAPHORE_DESTROY(pi->sem);
MUTEX_UNLOCK(&lock);
FREE(pi);
sendAcknowledgement(client, SYSERR);
@@ -672,7 +672,7 @@
}
MUTEX_UNLOCK(&lock);
SEMAPHORE_DOWN(pi->sem);
- SEMAPHORE_FREE(pi->sem);
+ SEMAPHORE_DESTROY(pi->sem);
uid = pi->uid;
if (uid == -1) {
errno = pi->errno_;
Modified: GNUnet/src/applications/tracekit/gnunet-tracekit.c
===================================================================
--- GNUnet/src/applications/tracekit/gnunet-tracekit.c 2006-07-31 04:19:56 UTC
(rev 3199)
+++ GNUnet/src/applications/tracekit/gnunet-tracekit.c 2006-07-31 04:32:21 UTC
(rev 3200)
@@ -400,7 +400,7 @@
wait_for_shutdown();
closeSocketTemporarily(sock);
SEMAPHORE_DOWN(doneSem);
- SEMAPHORE_FREE(doneSem);
+ SEMAPHORE_DESTROY(doneSem);
PTHREAD_JOIN(&messageReceiveThread, &unused);
doneShutdownHandlers();
releaseClientSocket(sock);
Modified: GNUnet/src/applications/vpn/gnunet-vpn.c
===================================================================
--- GNUnet/src/applications/vpn/gnunet-vpn.c 2006-07-31 04:19:56 UTC (rev
3199)
+++ GNUnet/src/applications/vpn/gnunet-vpn.c 2006-07-31 04:32:21 UTC (rev
3200)
@@ -142,7 +142,7 @@
/* wait for shutdown... */
closeSocketTemporarily(sock);
SEMAPHORE_DOWN(doneSem);
- SEMAPHORE_FREE(doneSem);
+ SEMAPHORE_DESTROY(doneSem);
PTHREAD_JOIN(&messageReceiveThread, &unused);
releaseClientSocket(sock);
Modified: GNUnet/src/transports/http.c
===================================================================
--- GNUnet/src/transports/http.c 2006-07-31 04:19:56 UTC (rev 3199)
+++ GNUnet/src/transports/http.c 2006-07-31 04:32:21 UTC (rev 3200)
@@ -1302,7 +1302,7 @@
LOG_STRERROR(LOG_FAILURE, "socket");
closefile(http_pipe[0]);
closefile(http_pipe[1]);
- SEMAPHORE_FREE(serverSignal);
+ SEMAPHORE_DESTROY(serverSignal);
serverSignal = NULL;
http_shutdown = YES;
return SYSERR;
@@ -1334,7 +1334,7 @@
"No transport service started.\n"),
getGNUnetHTTPPort());
closefile(http_sock);
- SEMAPHORE_FREE(serverSignal);
+ SEMAPHORE_DESTROY(serverSignal);
serverSignal = NULL;
return SYSERR;
}
@@ -1349,7 +1349,7 @@
LOG_STRERROR(LOG_ERROR,
"pthread_create");
closefile(http_sock);
- SEMAPHORE_FREE(serverSignal);
+ SEMAPHORE_DESTROY(serverSignal);
serverSignal = NULL;
return SYSERR;
}
@@ -1371,7 +1371,7 @@
if (serverSignal != NULL) {
haveThread = YES;
SEMAPHORE_DOWN(serverSignal);
- SEMAPHORE_FREE(serverSignal);
+ SEMAPHORE_DESTROY(serverSignal);
} else
haveThread = NO;
serverSignal = NULL;
Modified: GNUnet/src/transports/smtp.c
===================================================================
--- GNUnet/src/transports/smtp.c 2006-07-31 04:19:56 UTC (rev 3199)
+++ GNUnet/src/transports/smtp.c 2006-07-31 04:32:21 UTC (rev 3200)
@@ -874,7 +874,7 @@
smtp_shutdown = YES;
PTHREAD_KILL(&dispatchThread, SIGALRM);
SEMAPHORE_DOWN(serverSignal);
- SEMAPHORE_FREE(serverSignal);
+ SEMAPHORE_DESTROY(serverSignal);
closefile(smtp_sock);
PTHREAD_JOIN(&dispatchThread, &unused);
pipename = getFileName("SMTP",
Modified: GNUnet/src/util/os/semaphoretest.c
===================================================================
--- GNUnet/src/util/os/semaphoretest.c 2006-07-31 04:19:56 UTC (rev 3199)
+++ GNUnet/src/util/os/semaphoretest.c 2006-07-31 04:32:21 UTC (rev 3200)
@@ -112,7 +112,7 @@
}
}
END:
- IPC_SEMAPHORE_FREE(ipc);
+ IPC_SEMAPHORE_DESTROY(ipc);
REMOVE("/tmp/gnunet_ipc_xchange");
if (me == 0) {
exit(ret);
Modified: GNUnet/src/util/threads/semaphoretest.c
===================================================================
--- GNUnet/src/util/threads/semaphoretest.c 2006-07-31 04:19:56 UTC (rev
3199)
+++ GNUnet/src/util/threads/semaphoretest.c 2006-07-31 04:32:21 UTC (rev
3200)
@@ -139,7 +139,7 @@
for (i=0;i<42;i++)
SEMAPHORE_DOWN(sem); /* fails by blocking */
if (SEMAPHORE_DOWN_NONBLOCKING(sem) != SYSERR) {
- SEMAPHORE_FREE(sem);
+ SEMAPHORE_DESTROY(sem);
printf("SEMAPHORE_DOWN_NONBLOCKING failed at %s:%u\n"
"Testcase deadlocked.\n",
__FILE__, __LINE__);
@@ -159,7 +159,7 @@
for (i=0;i<42;i++)
SEMAPHORE_DOWN(sem); /* fails by blocking */
if (SEMAPHORE_DOWN_NONBLOCKING(sem) != SYSERR) {
- SEMAPHORE_FREE(sem);
+ SEMAPHORE_DESTROY(sem);
printf("SEMAPHORE_DOWN_NONBLOCKING failed at %s:%u\n",
__FILE__, __LINE__);
return 1;
@@ -168,13 +168,13 @@
SEMAPHORE_UP(sem);
for (i=0;i<42;i++)
if (OK != SEMAPHORE_DOWN_NONBLOCKING(sem)) {
- SEMAPHORE_FREE(sem);
+ SEMAPHORE_DESTROY(sem);
printf("SEMAPHORE_DOWN_NONBLOCKING failed at %s:%u\n",
__FILE__, __LINE__);
return 1;
}
if (SEMAPHORE_DOWN_NONBLOCKING(sem) != SYSERR) {
- SEMAPHORE_FREE(sem);
+ SEMAPHORE_DESTROY(sem);
printf("SEMAPHORE_DOWN_NONBLOCKING failed at %s:%u\n",
__FILE__, __LINE__);
return 1;
@@ -190,7 +190,7 @@
for (i=0;i<42;i++)
SEMAPHORE_DOWN(sem);
if (SEMAPHORE_DOWN_NONBLOCKING(sem) != SYSERR) {
- SEMAPHORE_FREE(sem);
+ SEMAPHORE_DESTROY(sem);
printf("SEMAPHORE_DOWN_NONBLOCKING failed at %s:%u\n",
__FILE__, __LINE__);
return 1;
Modified: GNUnet/src/util/threads/timertest.c
===================================================================
--- GNUnet/src/util/threads/timertest.c 2006-07-31 04:19:56 UTC (rev 3199)
+++ GNUnet/src/util/threads/timertest.c 2006-07-31 04:32:21 UTC (rev 3200)
@@ -120,7 +120,7 @@
"Timer precision is acceptable.\n");
stopCron();
- SEMAPHORE_FREE(sem);
+ SEMAPHORE_DESTROY(sem);
return 0;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r3200 - in GNUnet/src: applications/chat applications/datastore applications/dht/module applications/fs/fsui applications/fs/lib applications/fs/tools applications/rpc applications/tbench applications/template applications/testbed applications/tracekit applications/vpn transports util/os util/threads,
grothoff <=