X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ipc.c;h=debf9d11be254ed6cf07d7dc390763cbc0f5fb8d;hp=9ae2b3a09d1e1d98617e4502c16f7af2f0f54742;hb=d0381117c7bce410b626bc159ab7763fdb022397;hpb=730cb7dd464355316ee30846a3d2e91f22b4f7e1

diff --git a/ipc.c b/ipc.c
index 9ae2b3a0..debf9d11 100644
--- a/ipc.c
+++ b/ipc.c
@@ -1,17 +1,42 @@
+/*
+ * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ *
+ * Licensed under the GPL v2. For licencing details see COPYING.
+ */
+
+/** \file ipc.c interprocess communication and shared memory helpers */
+
 #include "para.h"
 #include "error.h"
 #include "ipc.h"
 #include <sys/ipc.h>
 #include <sys/shm.h>
+#include <sys/sem.h>
 
-
+/**
+ * define a new mutex
+ *
+ * \return the identifier for the new mutex on success, \a -E_SEM_GET
+ * on errors.
+ *
+ * \sa semget(2)
+ */
 int mutex_new(void)
 {
 	int ret = semget(IPC_PRIVATE, 1, IPC_CREAT | 0666);
 	return ret < 0?  -E_SEM_GET : ret;
 }
 
-int mutex_remove(int id)
+/**
+ * destroy a mutex
+ *
+ * \param id the identifier of the mutex to be destroyed
+ *
+ * \return Positive on success, \a -E_SEM_REMOVE on errors.
+ *
+ * \sa semctl(2)
+ */
+int mutex_destroy(int id)
 {
 	int ret = semctl(id, 0, IPC_RMID);
 	return ret < 0? -E_SEM_REMOVE : 1;
@@ -19,16 +44,25 @@ int mutex_remove(int id)
 
 static void para_semop(int id, struct sembuf *sops, int num)
 {
-	if (semop(id, sops, num) >= 0)
+	do {
+		if (semop(id, sops, num) >= 0)
+			return;
+	} while (errno == EINTR);
+	if (errno == EIDRM) {
+		PARA_NOTICE_LOG("semaphore set %d was removed\n", id);
 		return;
-	PARA_WARNING_LOG("semop failed (%s), retrying\n", strerror(errno));
-	while (semop(id, sops, num) < 0)
-		; /* nothing */
+	}
+	PARA_EMERG_LOG("fatal semop error %s: pid %d\n", strerror(errno), getpid());
+	exit(EXIT_FAILURE);
 }
 
 /**
  * lock the given mutex
  *
+ * \param id of the shared memory area to lock
+ *
+ * This function either succeeds or aborts.
+ *
  * \sa semop(2), struct misc_meta_data
  */
 void mutex_lock(int id)
@@ -51,6 +85,10 @@ void mutex_lock(int id)
 /**
  * unlock a mutex
  *
+ * \param id the identifier of the mutex
+ *
+ * This function either succeeds or aborts.
+ *
  * \sa semop(2), struct misc_meta_data
  */
 void mutex_unlock(int id)
@@ -67,7 +105,11 @@ void mutex_unlock(int id)
 
 /**
  * create a new shared memory area of given size
- * 
+ *
+ * \param size the size of the shared memory area to create
+ *
+ * \return The id of the shared memory areay on success, \a -E_SHM_GET on errors.
+ *
  * \sa shmget(2)
  */
 int shm_new(size_t size)
@@ -78,8 +120,14 @@ int shm_new(size_t size)
 
 /**
  * destroy the given shared memory area
+ *
+ * \param id the shared memory id
+ *
+ * \return The return value of the underlying shmctl() call on success,
+ * \a -E_SHM_DESTROY on errors.
+ *
  * \sa shmctl(2)
- **/
+ */
 int shm_destroy(int id)
 {
 	struct shmid_ds shm_desc;
@@ -88,16 +136,35 @@ int shm_destroy(int id)
 }
 
 /**
- * attach a shared memory area
+ * attach a shared memory segment
  *
- * \sa semop(2)
+ * \param id the identifier of the shared memory segment to attach
+ * \param mode either ATTACH_RO (read only) or ATTACH_RW (read/write)
+ * \param result points to the attached area just attached
+ *
+ * \return positive on success, \a -E_SHM_ATTACH on errors.
+ *
+ * \sa shmat(2)
  */
-void *shm_attach(int id, enum shm_attach_mode mode)
+int shm_attach(int id, enum shm_attach_mode mode, void **result)
 {
-	if (mode == ATTACH_RW)
-		return shmat(id, NULL, 0);
-	return shmat(id, NULL, SHM_RDONLY);
+	if (mode == ATTACH_RW) {
+		*result = shmat(id, NULL, 0);
+		return *result? 1 : -E_SHM_ATTACH;
+	}
+	*result = shmat(id, NULL, SHM_RDONLY);
+	return *result? 1 : -E_SHM_ATTACH;
 }
+
+/**
+ * detach a shared memory segment
+ *
+ * \param addr the address of the attached segment
+ *
+ * \return positive on success, \a -E_SHM_DETACH on errors.
+ *
+ * \sa shmdt(2)
+ */
 int shm_detach(void *addr)
 {
 	int ret = shmdt(addr);