Fix number of whitespaces in duration status item.

[paraslash.git] / ipc.c

diff --git a/ipc.c b/ipc.c
index acf0249d15762e09c82f5d994506b49cc759a375..debf9d11be254ed6cf07d7dc390763cbc0f5fb8d 100644 (file)
--- a/ipc.c
+++ b/ipc.c
@@ -1,19 +1,7 @@
 /*
  * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file ipc.c interprocess communication and shared memory helpers */
@@ -25,9 +13,6 @@
 #include <sys/shm.h>
 #include <sys/sem.h>
 
-/** abort if semget() failed that many times */
-#define MAX_SEMOP_RETRIES 500
-
 /**
  * define a new mutex
  *
@@ -57,14 +42,17 @@ int mutex_destroy(int id)
        return ret < 0? -E_SEM_REMOVE : 1;
 }
 
-static void para_semop(int id, struct sembuf *sops, unsigned num)
+static void para_semop(int id, struct sembuf *sops, int num)
 {
-       int i;
-
-       for (i = 0; i < MAX_SEMOP_RETRIES; i++)
+       do {
                if (semop(id, sops, num) >= 0)
                        return;
-       PARA_EMERG_LOG("semop failed %d times, aborting\n", MAX_SEMOP_RETRIES);
+       } while (errno == EINTR);
+       if (errno == EIDRM) {
+               PARA_NOTICE_LOG("semaphore set %d was removed\n", id);
+               return;
+       }
+       PARA_EMERG_LOG("fatal semop error %s: pid %d\n", strerror(errno), getpid());
        exit(EXIT_FAILURE);
 }