Merge tag 'upstream/3.3.1'

[debian/amanda] / common-src / semaphore.c

diff --git a/common-src/semaphore.c b/common-src/semaphore.c
deleted file mode 100644 (file)
index d82baf4..0000000
--- a/common-src/semaphore.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, 2010 Zmanda, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
- *
- * 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-1307 USA
- *
- * Contact information: Zmanda Inc., 465 S. Mathilda Ave., Suite 300
- * Sunnyvale, CA 94085, USA, or: http://www.zmanda.com
- */
-
-/* GLib does not provide semaphores, which are useful in queue.c.
-   So, we implement it here. */
-
-#include "amanda.h"
-#include "semaphore.h"
-
-semaphore_t* semaphore_new_with_value(int value) {
-    semaphore_t *rval;
-
-    if (!g_thread_supported())
-        return NULL;
-
-    rval = malloc(sizeof(*rval));
-    rval->value = value;
-    rval->mutex = g_mutex_new();
-    rval->decrement_cond = g_cond_new();
-    rval->zero_cond = g_cond_new();
-    
-    if (rval->mutex == NULL || rval->decrement_cond == NULL ||
-        rval->zero_cond == NULL) {
-        semaphore_free(rval);
-        return NULL;
-    } else {
-        return rval;
-    }
-}
-
-void semaphore_free(semaphore_t* o) {
-    g_mutex_free(o->mutex);
-    g_cond_free(o->decrement_cond);
-    g_cond_free(o->zero_cond);
-    free(o);
-}
-
-/* This function checks if the semaphore would is zero or negative.
- * If so, the zero_cond is signalled. We assume that the mutex is
- * locked. */
-static void check_empty(semaphore_t * o) {
-    if (o->value <= 0) {
-        g_cond_broadcast(o->zero_cond);
-    }
-}
-
-void semaphore_increment(semaphore_t* o, unsigned int inc) {
-    g_return_if_fail(o != NULL);
-    g_return_if_fail(inc != 0);
-
-    semaphore_force_adjust(o, inc);
-}
-
-void semaphore_decrement(semaphore_t* o, unsigned int dec) {
-    int sdec;
-    g_return_if_fail(o != NULL);
-    sdec = (int) dec;
-    g_return_if_fail(sdec >= 0);
-
-    g_mutex_lock(o->mutex);
-    while (o->value < sdec) {
-        g_cond_wait(o->decrement_cond, o->mutex);
-    }
-    o->value -= sdec;
-    check_empty(o);
-    g_mutex_unlock(o->mutex);
-}
-
-void semaphore_force_adjust(semaphore_t* o, int inc) {
-    g_return_if_fail(o != NULL);
-
-    g_mutex_lock(o->mutex);
-    o->value += inc;
-    if (inc < 0)
-       check_empty(o);
-    else
-       g_cond_broadcast(o->decrement_cond);
-    g_mutex_unlock(o->mutex);
-
-}
-
-void semaphore_force_set(semaphore_t* o, int value) {
-    int oldvalue;
-    g_return_if_fail(o != NULL);
-    
-    g_mutex_lock(o->mutex);
-    oldvalue = o->value;
-    o->value = value;
-    if (value < oldvalue)
-       check_empty(o);
-    else
-       g_cond_broadcast(o->decrement_cond);
-    g_mutex_unlock(o->mutex);
-    
-}
-
-void semaphore_wait_empty(semaphore_t * o) {
-    g_return_if_fail(o != NULL);
-    
-    g_mutex_lock(o->mutex);
-    while (o->value > 0) {
-        g_cond_wait(o->zero_cond, o->mutex);
-    }
-    g_mutex_unlock(o->mutex);
-}