--- ext/sysvsem/sysvsem.c.orig Thu Mar 15 22:40:18 2001
+++ ext/sysvsem/sysvsem.c Fri Mar 16 00:52:18 2001
@@ -53,6 +53,7 @@
PHP_FE(sem_get, NULL)
PHP_FE(sem_acquire, NULL)
PHP_FE(sem_release, NULL)
+ PHP_FE(sem_remove, NULL)
{NULL, NULL, NULL}
};
@@ -92,6 +93,14 @@
sysvsem_sem *sem_ptr = (sysvsem_sem *)rsrc->ptr;
struct sembuf sop[2];
+/*
+ * if count == -1, semaphore has been removed
+ * Need better way to handle this
+ */
+
+ if(sem_ptr->count == -1) {
+ return;
+ }
/* Decrement the usage count. */
sop[0].sem_num = SYSVSEM_USAGE;
@@ -343,6 +352,78 @@
{
php_sysvsem_semop(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
}
+/* }}} */
+
+
+
+
+/* {{{ proto int sem_remove(int id)
+ Removes semaphore from Unix systems */
+
+/*
+ * contributed by Gavin Sherry gavin <email protected>
+ * Fri Mar 16 00:50:13 EST 2001
+ */
+
+PHP_FUNCTION(sem_remove)
+{
+ pval **arg_id;
+ int id,type;
+ sysvsem_sem *sem_ptr;
+#if HAVE_SEMUN
+ union semun un;
+#endif
+
+
+
+/*
+ * bug in the original SHM code. First arg is id, not key. Fix this!
+ */
+/*
+ if(ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg_key) == FAILURE) {
+ WRONG_PARAM_COUNT;
+ }
+*/
+
+ if(ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg_id) == FAILURE) {
+ WRONG_PARAM_COUNT;
+ }
+
+
+ convert_to_long_ex(arg_id);
+
+ id = (*arg_id)->value.lval;
+
+ sem_ptr = (sysvsem_sem *) zend_list_find(id, &type);
+
+ if (type!=php_sysvsem_module.le_sem) {
+ php_error(E_WARNING, "%d is not a SysV semaphore index", id);
+ RETURN_FALSE;
+ }
+
+
+#if HAVE_SEMUN
+ if(semctl(sem_ptr->semid,NULL,IPC_STAT,un)<0) {
+#else
+ if(semctl(sem_ptr->semid,NULL,IPC_STAT,NULL)<0) {
+#endif
+ php_error(E_WARNING, "%d is not a existing SysV Semaphore Id", id);
+ RETURN_FALSE;
+ }
+
+ if(semctl(sem_ptr->semid,NULL,IPC_RMID,NULL)<0) {
+ php_error(E_WARNING, "sem_remove() failed for id %d: %s", id, strerror(errno));
+ RETURN_FALSE;
+ }
+
+ /* let release_sysvsem_sem knows we have removed
+ * the semaphore to avoid issues with releasing.
+ */
+
+ sem_ptr->count = -1;
+ RETURN_TRUE;
+}
+
/* }}} */
#endif /* HAVE_SYSVSEM */
