httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-apr/apr/locks/beos crossproc.c intraproc.c locks.c locks.h
Date Mon, 17 May 1999 18:41:16 GMT
rbb         99/05/17 11:41:16

  Added:       apr/locks/beos crossproc.c intraproc.c locks.c locks.h
  Log:
  Initial BeOS locks implementation
  Submitted by:  David Reid
  
  Revision  Changes    Path
  1.1                  apache-apr/apr/locks/beos/crossproc.c
  
  Index: crossproc.c
  ===================================================================
  /* ====================================================================
   * Copyright (c) 1999 The Apache Group.  All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer. 
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. All advertising materials mentioning features or use of this
   *    software must display the following acknowledgment:
   *    "This product includes software developed by the Apache Group
   *    for use in the Apache HTTP server project (http://www.apache.org/)."
   *
   * 4. The names "Apache Server" and "Apache Group" must not be used to
   *    endorse or promote products derived from this software without
   *    prior written permission. For written permission, please contact
   *    apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * 6. Redistributions of any form whatsoever must retain the following
   *    acknowledgment:
   *    "This product includes software developed by the Apache Group
   *    for use in the Apache HTTP server project (http://www.apache.org/)."
   *
   * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
   * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
   * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
   * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
   * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
   * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
   * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
   * OF THE POSSIBILITY OF SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Group.
   * For more information on the Apache Group and the Apache HTTP server
   * project, please see <http://www.apache.org/>.
   *
   */
  
  #include "apr_lock.h"
  #include "apr_general.h"
  #include "locks.h"
  
  ap_status_t lock_inter_cleanup(ap_context_t *cont, ap_lock_t *lock)
  {
      if (lock->curr_locked == 1) {
      	if (atomic_add(&lock->ben_interproc , -1) > 1){
      		release_sem (lock->sem_interproc);
      	} else {
      		return APR_FAILURE;
      	}
      }
      return APR_SUCCESS;
  }    
  
  ap_status_t create_inter_lock(ap_context_t *cont, ap_lock_t *new)
  {
      new->sem_interproc = (sem_id)ap_palloc(cont->pool, sizeof(sem_id));
      new->ben_interproc = (int32)ap_palloc(cont->pool, sizeof(int32));
      
      new->ben_interproc = 0;
      new->sem_interproc = create_sem(0, "ap_intraproc");
      if (new->sem_interproc < B_NO_ERROR){
      	lock_inter_cleanup(cont, new);
          return APR_FAILURE;
      }
      new->curr_locked == 0;
      ap_register_cleanup(cont->pool, (void *)new, lock_inter_cleanup, NULL);
      return APR_SUCCESS;
  }
  
  ap_status_t lock_inter(ap_context_t *cont, ap_lock_t *lock)
  {
  	if (atomic_add(&lock->ben_interproc, 1) > 0){
  		acquire_sem(lock->sem_interproc);
  	} else {
  		return APR_FAILURE;
  	}
      lock->curr_locked == 1;
      return APR_SUCCESS;
  }
  
  ap_status_t unlock_inter(ap_context_t *cont, ap_lock_t *lock)
  {
  	if (atomic_add(&lock->ben_interproc, -1) > 1){
  		release_sem(lock->sem_interproc);
      } else {
      	return APR_FAILURE;
      }
      lock->curr_locked == 0;
      return APR_SUCCESS;
  }
  
  ap_status_t destroy_inter_lock(ap_context_t *cont, ap_lock_t *lock)
  {
      if (lock_inter_cleanup(cont, lock) == APR_SUCCESS) {
          ap_kill_cleanup(cont->pool, lock, lock_inter_cleanup);
          return APR_SUCCESS;
      }
      return APR_FAILURE;
  }
  
  
  
  1.1                  apache-apr/apr/locks/beos/intraproc.c
  
  Index: intraproc.c
  ===================================================================
  /* ====================================================================
   * Copyright (c) 1999 The Apache Group.  All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer. 
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. All advertising materials mentioning features or use of this
   *    software must display the following acknowledgment:
   *    "This product includes software developed by the Apache Group
   *    for use in the Apache HTTP server project (http://www.apache.org/)."
   *
   * 4. The names "Apache Server" and "Apache Group" must not be used to
   *    endorse or promote products derived from this software without
   *    prior written permission. For written permission, please contact
   *    apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * 6. Redistributions of any form whatsoever must retain the following
   *    acknowledgment:
   *    "This product includes software developed by the Apache Group
   *    for use in the Apache HTTP server project (http://www.apache.org/)."
   *
   * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
   * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
   * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
   * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
   * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
   * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
   * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
   * OF THE POSSIBILITY OF SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Group.
   * For more information on the Apache Group and the Apache HTTP server
   * project, please see <http://www.apache.org/>.
   *
   */
  
  #include "apr_lock.h"
  #include "apr_general.h"
  #include "locks.h"
  #include <kernel/OS.h>
  
  ap_status_t lock_intra_cleanup(ap_context_t *cont, ap_lock_t *lock)
  {
      if (lock->curr_locked == 1) {
      	if (atomic_add(&lock->ben_intraproc , -1) > 1){
      		release_sem (lock->sem_intraproc);
      	} else {
      		return APR_FAILURE;
      	}
      }
      return APR_SUCCESS;
  }    
  
  ap_status_t create_intra_lock(ap_context_t *cont, ap_lock_t *new)
  {
      new->sem_intraproc = (sem_id)ap_palloc(cont->pool, sizeof(sem_id));
      new->ben_intraproc = (int32)ap_palloc(cont->pool, sizeof(int32));
      
      new->ben_intraproc = 0;
      new->sem_intraproc = create_sem(0, "ap_intraproc");
      if (new->sem_intraproc < B_NO_ERROR){
      	lock_intra_cleanup(cont, new);
          return APR_FAILURE;
      }
      new->curr_locked == 0;
      ap_register_cleanup(cont->pool, (void *)new, lock_intra_cleanup, NULL);
      return APR_SUCCESS;
  }
  
  ap_status_t lock_intra(ap_context_t *cont, ap_lock_t *lock)
  {
      lock->curr_locked == 1;
  	if (atomic_add (&lock->ben_intraproc, 1) >0){
  		if (acquire_sem(lock->sem_intraproc) != B_NO_ERROR){
  			atomic_add(&lock->ben_intraproc,-1);
  	        return(APR_FAILURE);
      	}
      }
      return APR_SUCCESS;
  }
  
  ap_status_t unlock_intra(ap_context_t *cont, ap_lock_t *lock)
  {
  	if (atomic_add(&lock->ben_intraproc, -1) > 1){
  		release_sem(lock->sem_intraproc);
      }
      lock->curr_locked == 0;
      return APR_SUCCESS;
  }
  
  ap_status_t destroy_intra_lock(ap_context_t *cont, ap_lock_t *lock)
  {
      if (lock_intra_cleanup(cont, lock) == APR_SUCCESS) {
          ap_kill_cleanup(cont->pool, lock, lock_intra_cleanup);
          return APR_SUCCESS;
      }
      return APR_FAILURE;
  }
  
  
  
  1.1                  apache-apr/apr/locks/beos/locks.c
  
  Index: locks.c
  ===================================================================
  /* ====================================================================
   * Copyright (c) 1999 The Apache Group.  All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer. 
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. All advertising materials mentioning features or use of this
   *    software must display the following acknowledgment:
   *    "This product includes software developed by the Apache Group
   *    for use in the Apache HTTP server project (http://www.apache.org/)."
   *
   * 4. The names "Apache Server" and "Apache Group" must not be used to
   *    endorse or promote products derived from this software without
   *    prior written permission. For written permission, please contact
   *    apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * 6. Redistributions of any form whatsoever must retain the following
   *    acknowledgment:
   *    "This product includes software developed by the Apache Group
   *    for use in the Apache HTTP server project (http://www.apache.org/)."
   *
   * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
   * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
   * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
   * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
   * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
   * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
   * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
   * OF THE POSSIBILITY OF SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Group.
   * For more information on the Apache Group and the Apache HTTP server
   * project, please see <http://www.apache.org/>.
   *
   */
  
  #include "apr_lock.h"
  #include "apr_general.h"
  #include "locks.h"
  #include <strings.h>
  
  ap_lock_t *ap_create_lock(ap_context_t *cont, ap_locktype_e type, char *fname)
  {
      ap_lock_t *new;
  
      new = (ap_lock_t *)ap_palloc(cont->pool, sizeof(ap_lock_t));
  
      new->type = type;
      new->fname = strdup(fname);
  
      if (type != APR_CROSS_PROCESS) {
          if (create_intra_lock(cont, new) == APR_FAILURE) {
              return NULL;
          }
      }
      if (type != APR_INTRAPROCESS) {
          if (create_inter_lock(cont, new) == APR_FAILURE) {
              return NULL;
          }
      }
      return new;
  }
  
  ap_status_t ap_lock(ap_context_t *cont, ap_lock_t *lock)
  {
      if (lock->type != APR_CROSS_PROCESS) {
          if (lock_intra(cont, lock) == APR_FAILURE) {
              return APR_FAILURE;
          }
      }
      if (lock->type != APR_INTRAPROCESS) {
          if (lock_inter(cont, lock) == APR_FAILURE) {
              return APR_FAILURE;
          }
      }
      return APR_SUCCESS;
  }
  
  ap_status_t ap_unlock(ap_context_t *cont, ap_lock_t *lock)
  {
      if (lock->type != APR_CROSS_PROCESS) {
          if (unlock_intra(cont, lock) == APR_FAILURE) {
              return APR_FAILURE;
          }
      }
      if (lock->type != APR_INTRAPROCESS) {
          if (unlock_inter(cont, lock) == APR_FAILURE) {
              return APR_FAILURE;
          }
      }
      return APR_SUCCESS;
  }
  
  ap_status_t ap_destroy_lock(ap_context_t *cont, ap_lock_t *lock)
  {
      if (lock->type != APR_CROSS_PROCESS) {
          if (destroy_intra_lock(cont, lock) == APR_FAILURE) {
              return APR_FAILURE;
          }
      }
      if (lock->type != APR_INTRAPROCESS) {
          if (destroy_inter_lock(cont, lock) == APR_FAILURE) {
              return APR_FAILURE;
          }
      }
      return APR_SUCCESS;
  }
  
  
  
  
  
  1.1                  apache-apr/apr/locks/beos/locks.h
  
  Index: locks.h
  ===================================================================
  /* ====================================================================
   * Copyright (c) 1999 The Apache Group.  All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. All advertising materials mentioning features or use of this
   *    software must display the following acknowledgment:
   *    "This product includes software developed by the Apache Group
   *    for use in the Apache HTTP server project (http://www.apache.org/)."
   *
   * 4. The names "Apache Server" and "Apache Group" must not be used to
   *    endorse or promote products derived from this software without
   *    prior written permission. For written permission, please contact
   *    apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * 6. Redistributions of any form whatsoever must retain the following
   *    acknowledgment:
   *    "This product includes software developed by the Apache Group
   *    for use in the Apache HTTP server project (http://www.apache.org/)."
   *
   * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
   * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
   * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
   * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
   * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
   * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
   * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
   * OF THE POSSIBILITY OF SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Group.
   * For more information on the Apache Group and the Apache HTTP server
   * project, please see <http://www.apache.org/>.
   *
   */
  #ifndef LOCKS_H
  #define LOCKS_H
  
  #include <kernel/OS.h>
  #include "apr_lock.h"
  #include "apr_file_io.h"
  
  struct lock_t {
      ap_locktype_e type;
      int curr_locked;
      char *fname;
  	/* Inter proc */
  	sem_id sem_interproc;
  	int32  ben_interproc;
  	/* Intra Proc */
  	sem_id sem_intraproc;
  	int32  ben_intraproc;
      /* At some point, we should do a type for both inter and intra process
       *  locking here.  Something like pthread_mutex with PTHREAD_PROCESS_SHARED
       */    
  };
  
  #endif  /* LOCKS_H */
  
  
  
  

Mime
View raw message