[GNUnet-SVN] r23000 - Extractor/src/main

[gnunet]

Author: grothoff
Date: 2012-07-31 00:38:26 +0200 (Tue, 31 Jul 2012)
New Revision: 23000

Modified:
   Extractor/src/main/extractor_ipc_gnu.c
   Extractor/src/main/extractor_plugin_main.c
Log:
-fixes

Modified: Extractor/src/main/extractor_ipc_gnu.c
===================================================================
--- Extractor/src/main/extractor_ipc_gnu.c      2012-07-30 22:30:03 UTC (rev 
22999)
+++ Extractor/src/main/extractor_ipc_gnu.c      2012-07-30 22:38:26 UTC (rev 
23000)
@@ -154,6 +154,9 @@
            "%slibextractor-shm-%u-%u", 
            tpath, getpid (),
            (unsigned int) RANDOM());
+  LOG ("Creating shared memory `%s' with %u bytes capacity\n",
+       shm->shm_name,
+       (unsigned int) size);
   if (-1 == (shm->shm_id = shm_open (shm->shm_name,
                                     O_RDWR | O_CREAT, S_IRUSR | S_IWUSR)))
     {
@@ -204,6 +207,8 @@
 void
 EXTRACTOR_IPC_shared_memory_destroy_ (struct EXTRACTOR_SharedMemory *shm)
 {  
+  LOG ("Destroying shared memory `%s'\n",
+       shm->shm_name);
   munmap (shm->shm_ptr, shm->shm_size);
   (void) close (shm->shm_id);
   (void) shm_unlink (shm->shm_name);
@@ -442,10 +447,10 @@
       if ( (-1 == (iret = read (channel->cpipe_out,
                                &channel->data[channel->size],
                                MAX_META_DATA - channel->size)) ) ||
-          (ret = EXTRACTOR_IPC_process_reply_ (channel->plugin,
-                                               channel->data, 
-                                               channel->size + iret, 
-                                               proc, proc_cls)) )
+          (-1 == (ret = EXTRACTOR_IPC_process_reply_ (channel->plugin,
+                                                      channel->data, 
+                                                      channel->size + iret, 
+                                                      proc, proc_cls)) ) )
        {
          if (-1 == iret)
            LOG_STRERROR ("read");

Modified: Extractor/src/main/extractor_plugin_main.c
===================================================================
--- Extractor/src/main/extractor_plugin_main.c  2012-07-30 22:30:03 UTC (rev 
22999)
+++ Extractor/src/main/extractor_plugin_main.c  2012-07-30 22:38:26 UTC (rev 
23000)
@@ -367,7 +367,7 @@
     if (NULL == pc->shm)
       return -1;
 #else
-    pc->shm_id = open (shm_name, O_RDONLY, 0);
+    pc->shm_id = shm_open (shm_name, O_RDONLY, 0);
     if (-1 == pc->shm_id)
       {
        LOG_STRERROR_FILE ("open", shm_name);