libextractor

commit c8d8ea6288be0d7b5117197f08739b3e85785367
parent ee5c311ab74b3b3e2aa9729cf40ef2aafe93c64f
Author: Christian Grothoff <christian@grothoff.org>
Date:   Mon, 30 Jul 2012 22:38:26 +0000

-fixes

Diffstat:
M
src/main/extractor_ipc_gnu.c
 | 
13
+++++++++----
M
src/main/extractor_plugin_main.c
 | 
2
+-

2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/extractor_ipc_gnu.c b/src/main/extractor_ipc_gnu.c
@@ -154,6 +154,9 @@ EXTRACTOR_IPC_shared_memory_create_ (size_t size)
 	    "%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 @@ EXTRACTOR_IPC_shared_memory_change_rc_ (struct EXTRACTOR_SharedMemory *shm,
 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 @@ EXTRACTOR_IPC_channel_recv_ (struct EXTRACTOR_Channel **channels,
       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");
diff --git a/src/main/extractor_plugin_main.c b/src/main/extractor_plugin_main.c
@@ -367,7 +367,7 @@ handle_init_message (struct ProcessingContext *pc)
     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);