httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dr...@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/threadproc/beos Makefile.in proc.c thread.c threadpriv.c
Date Sun, 19 Nov 2000 01:05:18 GMT
dreid       00/11/18 17:05:17

  Modified:    src/lib/apr/locks/beos locks.c
               src/lib/apr/threadproc/beos Makefile.in proc.c thread.c
                        threadpriv.c
  Log:
  More fixes to get BeOS building and a few missing functions to try and
  keep exports.c happy :)  With these changes we're now back building again.
  
  Revision  Changes    Path
  1.22      +28 -0     apache-2.0/src/lib/apr/locks/beos/locks.c
  
  Index: locks.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/locks.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- locks.c	2000/11/18 21:26:13	1.21
  +++ locks.c	2000/11/19 01:05:15	1.22
  @@ -54,6 +54,7 @@
   
   #include "beos/locks.h"
   #include "apr_strings.h"
  +#include "apr_portable.h"
   
   apr_status_t apr_create_lock(apr_lock_t **lock, apr_locktype_e type, 
                              apr_lockscope_e scope, const char *fname, 
  @@ -158,3 +159,30 @@
       return apr_set_userdata(data, key, cleanup, lock->cntxt);
   }
   
  +apr_status_t apr_get_os_lock(apr_os_lock_t *oslock, apr_lock_t *lock)
  +{
  +    oslock->sem_interproc = lock->sem_interproc;
  +    oslock->sem_intraproc = lock->sem_intraproc;
  +    oslock->ben_interproc = lock->ben_interproc;
  +    oslock->ben_intraproc = lock->ben_intraproc;
  +    return APR_SUCCESS;
  +}
  +
  +apr_status_t apr_put_os_lock(apr_lock_t **lock, apr_os_lock_t *thelock, 
  +                           apr_pool_t *cont)
  +{
  +    if (cont == NULL) {
  +        return APR_ENOPOOL;
  +    }
  +    if ((*lock) == NULL) {
  +        (*lock) = (apr_lock_t *)apr_pcalloc(cont, sizeof(apr_lock_t));
  +        (*lock)->cntxt = cont;
  +    }
  +    (*lock)->sem_interproc = thelock->sem_interproc;
  +    (*lock)->ben_interproc = thelock->ben_interproc;
  +
  +    (*lock)->sem_intraproc = thelock->sem_intraproc;
  +    (*lock)->ben_intraproc = thelock->ben_intraproc;
  +    return APR_SUCCESS;
  +}
  +    
  
  
  
  1.17      +1 -1      apache-2.0/src/lib/apr/threadproc/beos/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/Makefile.in,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Makefile.in	2000/11/18 16:54:16	1.16
  +++ Makefile.in	2000/11/19 01:05:16	1.17
  @@ -6,7 +6,7 @@
   INCDIR=../../include
   OSDIR=$(INCDIR)/arch/@OSDIR@
   DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
  -INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
  +INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch $(OSDIR) $(DEFOSDIR)
   MKDEP=../../helpers/mkdep.sh
   
   LIB=libthreadproc.a
  
  
  
  1.33      +6 -0      apache-2.0/src/lib/apr/threadproc/beos/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/proc.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- proc.c	2000/11/18 16:54:16	1.32
  +++ proc.c	2000/11/19 01:05:16	1.33
  @@ -53,6 +53,7 @@
    */
   
   #include "threadproc.h"
  +#include "apr_strings.h"
   
   struct send_pipe {
   	int in;
  @@ -365,3 +366,8 @@
       return APR_SUCCESS;
   }
   
  +apr_status_t apr_setprocattr_limit(apr_procattr_t *attr, apr_int32_t what, 
  +                          struct rlimit *limit)
  +{
  +    return APR_ENOTIMPL;
  +}
  
  
  
  1.15      +32 -0     apache-2.0/src/lib/apr/threadproc/beos/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/thread.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- thread.c	2000/11/18 16:54:16	1.14
  +++ thread.c	2000/11/19 01:05:16	1.15
  @@ -155,3 +155,35 @@
           return errno;
       }
   }
  +
  +apr_status_t apr_get_threaddata(void **data, const char *key, apr_thread_t *thread)
  +{
  +    return apr_get_userdata(data, key, thread->cntxt);
  +}
  +
  +apr_status_t apr_set_threaddata(void *data, const char *key,
  +                              apr_status_t (*cleanup) (void *),
  +                              apr_thread_t *thread)
  +{
  +    return apr_set_userdata(data, key, cleanup, thread->cntxt);
  +}
  +
  +apr_status_t apr_get_os_thread(apr_os_thread_t **thethd, apr_thread_t *thd)
  +{
  +    *thethd = &thd->td;
  +    return APR_SUCCESS;
  +}
  +
  +apr_status_t apr_put_os_thread(apr_thread_t **thd, apr_os_thread_t *thethd, 
  +                             apr_pool_t *cont)
  +{
  +    if (cont == NULL) {
  +        return APR_ENOPOOL;
  +    }
  +    if ((*thd) == NULL) {
  +        (*thd) = (apr_thread_t *)apr_pcalloc(cont, sizeof(apr_thread_t));
  +        (*thd)->cntxt = cont;
  +    }
  +    (*thd)->td = *thethd;
  +    return APR_SUCCESS;
  +}
  
  
  
  1.14      +33 -0     apache-2.0/src/lib/apr/threadproc/beos/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/threadpriv.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- threadpriv.c	2000/11/18 16:54:16	1.13
  +++ threadpriv.c	2000/11/19 01:05:16	1.14
  @@ -183,3 +183,36 @@
   	}
   	return APR_SUCCESS;
   }
  +
  +apr_status_t apr_get_threadkeydata(void **data, const char *key,
  +                                 apr_threadkey_t *threadkey)
  +{
  +    return apr_get_userdata(data, key, threadkey->cntxt);
  +}
  +
  +apr_status_t apr_set_threadkeydata(void *data, const char *key,
  +                                 apr_status_t (*cleanup) (void *),
  +                                 apr_threadkey_t *threadkey)
  +{
  +    return apr_set_userdata(data, key, cleanup, threadkey->cntxt);
  +}
  +
  +apr_status_t apr_get_os_threadkey(apr_os_threadkey_t *thekey, apr_threadkey_t *key)
  +{
  +    *thekey = key->key;
  +    return APR_SUCCESS;
  +}
  +
  +apr_status_t apr_put_os_threadkey(apr_threadkey_t **key, 
  +                                apr_os_threadkey_t *thekey, apr_pool_t *cont)
  +{
  +    if (cont == NULL) {
  +        return APR_ENOPOOL;
  +    }
  +    if ((*key) == NULL) {
  +        (*key) = (apr_threadkey_t *)apr_pcalloc(cont, sizeof(apr_threadkey_t));
  +        (*key)->cntxt = cont;
  +    }
  +    (*key)->key = *thekey;
  +    return APR_SUCCESS;
  +}           
  
  
  

Mime
View raw message