httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/time/unix time.c
Date Wed, 15 Mar 2000 17:05:14 GMT
rbb         00/03/15 09:05:14

  Modified:    src/lib/apr/file_io/unix fileacc.c
               src/lib/apr/include apr_portable.h apr_thread_proc.h
               src/lib/apr/shmem/unix shmem.c
               src/lib/apr/threadproc/unix proc.c procsup.c signals.c
                        thread.c threadcancel.c threadpriv.c
               src/lib/apr/time/unix time.c
  Log:
  Last doc update.
  
  Revision  Changes    Path
  1.17      +1 -1      apache-2.0/src/lib/apr/file_io/unix/fileacc.c
  
  Index: fileacc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/fileacc.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- fileacc.c	2000/03/14 16:36:12	1.16
  +++ fileacc.c	2000/03/15 17:05:10	1.17
  @@ -123,7 +123,7 @@
   
   /* ***APRDOC********************************************************
    * ap_status_t ap_set_filedata(ap_file_t *file, void *data, char *key,
  -                               ap_status (*cleanup) (void *))
  + *                             ap_status (*cleanup) (void *))
    *    Set the data associated with the current file.
    * arg 1) The currently open file.
    * arg 2) The user data to associate with the file.  
  
  
  
  1.26      +9 -6      apache-2.0/src/lib/apr/include/apr_portable.h
  
  Index: apr_portable.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_portable.h,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- apr_portable.h	2000/03/15 02:10:33	1.25
  +++ apr_portable.h	2000/03/15 17:05:10	1.26
  @@ -183,12 +183,12 @@
   ap_status_t ap_get_os_dir(ap_os_dir_t **thedir, ap_dir_t *dir);      
   ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, ap_socket_t *sock);
   ap_status_t ap_get_os_lock(ap_os_lock_t *oslock, ap_lock_t *lock);     
  -ap_status_t ap_get_os_proc(ap_os_proc_t *, ap_proc_t *);     
  +ap_status_t ap_get_os_proc(ap_os_proc_t *theproc, ap_proc_t *proc);     
   ap_status_t ap_get_os_exp_time(ap_os_exp_time_t **, ap_exploded_time_t *);     
   ap_status_t ap_get_os_imp_time(ap_os_imp_time_t **, ap_time_t *);     
   #if APR_HAS_THREADS
  -ap_status_t ap_get_os_thread(ap_os_thread_t *, ap_thread_t *);
  -ap_status_t ap_get_os_threadkey(ap_os_threadkey_t *, ap_key_t *);
  +ap_status_t ap_get_os_thread(ap_os_thread_t *thethd, ap_thread_t *thd);
  +ap_status_t ap_get_os_threadkey(ap_os_threadkey_t *thekey, ap_key_t *key);
   #endif
   
   ap_status_t ap_put_os_file(ap_file_t **file, ap_os_file_t *thefile, 
  @@ -199,12 +199,15 @@
                              ap_context_t *cont);
   ap_status_t ap_put_os_lock(ap_lock_t **lock, ap_os_lock_t *thelock, 
                              ap_context_t *cont); 
  -ap_status_t ap_put_os_proc(ap_proc_t **, ap_os_proc_t *, ap_context_t *); 
  +ap_status_t ap_put_os_proc(ap_proc_t **proc, ap_os_proc_t *theproc, 
  +                           ap_context_t *cont); 
   ap_status_t ap_put_os_imp_time(ap_time_t *, ap_os_imp_time_t **, ap_context_t *); 
   ap_status_t ap_put_os_exp_time(ap_exploded_time_t *, ap_os_exp_time_t **, ap_context_t
*); 
   #if APR_HAS_THREADS
  -ap_status_t ap_put_os_thread(ap_thread_t **, ap_os_thread_t *, ap_context_t *);
  -ap_status_t ap_put_os_threadkey(ap_key_t **, ap_os_threadkey_t *, ap_context_t *);
  +ap_status_t ap_put_os_thread(ap_thread_t **thd, ap_os_thread_t *thethd, 
  +                             ap_context_t *cont);
  +ap_status_t ap_put_os_threadkey(ap_key_t **key, ap_os_threadkey_t *thekey, 
  +                                ap_context_t *cont);
   #endif
   
   #ifdef __cplusplus
  
  
  
  1.13      +56 -49    apache-2.0/src/lib/apr/include/apr_thread_proc.h
  
  Index: apr_thread_proc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_thread_proc.h,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- apr_thread_proc.h	2000/03/10 00:06:09	1.12
  +++ apr_thread_proc.h	2000/03/15 17:05:10	1.13
  @@ -88,58 +88,65 @@
   typedef void *(API_THREAD_FUNC *ap_thread_start_t)(void *);
   
   /* Thread Function definitions */
  -ap_status_t ap_create_threadattr(ap_threadattr_t **, ap_context_t *);
  -ap_status_t ap_setthreadattr_detach(ap_threadattr_t *, ap_int32_t);
  -ap_status_t ap_getthreadattr_detach(ap_threadattr_t *);
  -ap_status_t ap_create_thread(ap_thread_t **, ap_threadattr_t *, 
  -                             ap_thread_start_t, void *, ap_context_t *);
  -ap_status_t ap_thread_exit(ap_thread_t *, ap_status_t *);
  -ap_status_t ap_thread_join(ap_status_t *, ap_thread_t *thd); 
  -ap_status_t ap_thread_detach(ap_thread_t *);
  -
  -ap_status_t ap_cancel_thread(ap_thread_t *);
  -ap_status_t ap_setcanceltype(ap_int32_t, ap_context_t *);
  -ap_status_t ap_setcancelstate(ap_int32_t, ap_context_t *);
  -ap_status_t ap_get_threaddata(void **, char *, ap_thread_t *);
  -ap_status_t ap_set_threaddata(void *, char *,
  -                              ap_status_t (*cleanup) (void *), ap_thread_t *);
  -
  -ap_status_t ap_create_thread_private(ap_key_t **, void (*dest)(void *), 
  -                                     ap_context_t *);
  -ap_status_t ap_get_thread_private(void **, ap_key_t *);
  -ap_status_t ap_set_thread_private(void *, ap_key_t *);
  -ap_status_t ap_delete_thread_private(ap_key_t *);
  -ap_status_t ap_get_threadkeydata(void **, char *, ap_key_t *);
  -ap_status_t ap_set_threadkeydata(void *, char *,
  -                                 ap_status_t (*cleanup) (void *), ap_key_t *);
  +ap_status_t ap_create_threadattr(ap_threadattr_t **new, ap_context_t *cont);
  +ap_status_t ap_setthreadattr_detach(ap_threadattr_t *attr, ap_int32_t on);
  +ap_status_t ap_getthreadattr_detach(ap_threadattr_t *iattr);
  +ap_status_t ap_create_thread(ap_thread_t **new, ap_threadattr_t *attr, 
  +                             ap_thread_start_t func, void *data, 
  +                             ap_context_t *cont);
  +ap_status_t ap_thread_exit(ap_thread_t *thd, ap_status_t *retval);
  +ap_status_t ap_thread_join(ap_status_t *retval, ap_thread_t *thd); 
  +ap_status_t ap_thread_detach(ap_thread_t *thd);
  +
  +ap_status_t ap_cancel_thread(ap_thread_t *thd);
  +ap_status_t ap_setcanceltype(ap_int32_t type, ap_context_t *cont);
  +ap_status_t ap_setcancelstate(ap_int32_t type, ap_context_t *cont);
  +ap_status_t ap_get_threaddata(void **data, char *key, ap_thread_t *thread);
  +ap_status_t ap_set_threaddata(void *data, char *key,
  +                              ap_status_t (*cleanup) (void *), 
  +                              ap_thread_t *thread);
  +
  +ap_status_t ap_create_thread_private(ap_key_t **key, void (*dest)(void *), 
  +                                     ap_context_t *cont);
  +ap_status_t ap_get_thread_private(void **new, ap_key_t *key);
  +ap_status_t ap_set_thread_private(void *priv, ap_key_t *key);
  +ap_status_t ap_delete_thread_private(ap_key_t *key);
  +ap_status_t ap_get_threadkeydata(void **data, char *key, ap_key_t *threadkey);
  +ap_status_t ap_set_threadkeydata(void *data, char *key,
  +                                 ap_status_t (*cleanup) (void *), 
  +                                 ap_key_t *threadkey);
   
   /* Process Function definitions */
  -ap_status_t ap_createprocattr_init(ap_procattr_t **, ap_context_t *);
  -ap_status_t ap_setprocattr_io(ap_procattr_t *, ap_int32_t, ap_int32_t, 
  -                              ap_int32_t);
  -ap_status_t ap_setprocattr_childin(struct procattr_t *, ap_file_t *,
  -                                   ap_file_t *);
  -ap_status_t ap_setprocattr_childout(struct procattr_t *, ap_file_t *,
  -                                    ap_file_t *);
  -ap_status_t ap_setprocattr_childerr(struct procattr_t *, ap_file_t *,
  -                                    ap_file_t *);
  -ap_status_t ap_setprocattr_dir(ap_procattr_t *, const char *);
  -ap_status_t ap_setprocattr_cmdtype(ap_procattr_t *, ap_cmdtype_e);
  -ap_status_t ap_setprocattr_detach(ap_procattr_t *, ap_int32_t);
  -ap_status_t ap_get_procdata(char *, void *, ap_proc_t *);
  -ap_status_t ap_set_procdata(void *, char *,
  -                            ap_status_t (*cleanup) (void *), ap_proc_t *);
  -
  -ap_status_t ap_get_childin(ap_file_t **, ap_proc_t *);
  -ap_status_t ap_get_childout(ap_file_t **, ap_proc_t *);
  -ap_status_t ap_get_childerr(ap_file_t **, ap_proc_t *);
  -
  -ap_status_t ap_fork(ap_proc_t **, ap_context_t *);
  -ap_status_t ap_create_process(ap_proc_t **, const char *, char *const [], 
  -                              char **, ap_procattr_t *, ap_context_t *);
  -ap_status_t ap_wait_proc(ap_proc_t *, ap_wait_how_e);
  +ap_status_t ap_createprocattr_init(ap_procattr_t **new, ap_context_t *cont);
  +ap_status_t ap_setprocattr_io(ap_procattr_t *attr, ap_int32_t in, 
  +                              ap_int32_t out, ap_int32_t err);
  +ap_status_t ap_setprocattr_childin(struct procattr_t *attr, ap_file_t *child_in,
  +                                   ap_file_t *parent_in);
  +ap_status_t ap_setprocattr_childout(struct procattr_t *attr, 
  +                                    ap_file_t *child_out, 
  +                                    ap_file_t *parent_out);
  +ap_status_t ap_setprocattr_childerr(struct procattr_t *attr, 
  +                                    ap_file_t *child_err,
  +                                    ap_file_t *parent_err);
  +ap_status_t ap_setprocattr_dir(ap_procattr_t *attr, const char *dir);
  +ap_status_t ap_setprocattr_cmdtype(ap_procattr_t *attr, ap_cmdtype_e cmd);
  +ap_status_t ap_setprocattr_detach(ap_procattr_t *attr, ap_int32_t detach);
  +ap_status_t ap_get_procdata(char *key, void *data, ap_proc_t *proc);
  +ap_status_t ap_set_procdata(void *data, char *key,
  +                            ap_status_t (*cleanup) (void *), ap_proc_t *proc);
  +
  +ap_status_t ap_get_childin(ap_file_t **new, ap_proc_t *proc);
  +ap_status_t ap_get_childout(ap_file_t **new, ap_proc_t *proc);
  +ap_status_t ap_get_childerr(ap_file_t **new, ap_proc_t *proc);
  +
  +ap_status_t ap_fork(ap_proc_t **proc, ap_context_t *cont);
  +ap_status_t ap_create_process(ap_proc_t **new, const char *progname, 
  +                              char *const args[], char **env, 
  +                              ap_procattr_t *attr, ap_context_t *cont);
  +ap_status_t ap_wait_proc(ap_proc_t *proc, ap_wait_how_e waithow);
  +ap_status_t ap_detach(ap_proc_t **new, ap_context_t *cont);
   
  -ap_status_t ap_kill(ap_proc_t *, ap_int32_t);
  +ap_status_t ap_kill(ap_proc_t *proc, int sig);
   #ifdef __cplusplus
   }
   #endif
  
  
  
  1.7       +9 -9      apache-2.0/src/lib/apr/shmem/unix/shmem.c
  
  Index: shmem.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/shmem.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- shmem.c	2000/03/10 00:06:31	1.6
  +++ shmem.c	2000/03/15 17:05:11	1.7
  @@ -63,7 +63,7 @@
   };
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_shm_init(ap_shmem_t *, ap_size_t, char *)
  + * ap_status_t ap_shm_init(ap_shmem_t *m, ap_size_t reqsize, char *file)
    *    Create a pool of shared memory for use later.
    * arg 1) The shared memory block.
    * arg 2) The size of the shared memory pool.
  @@ -82,7 +82,7 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_shm_destroy(ap_shmem_t *)
  + * ap_status_t ap_shm_destroy(ap_shmem_t *m)
    *    Destroy the shared memory block.
    * arg 1) The shared memory block to destroy. 
    */
  @@ -93,7 +93,7 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_shm_malloc(ap_shmem_t *, ap_size_t)
  + * ap_status_t ap_shm_malloc(ap_shmem_t *c, ap_size_t reqsize)
    *    allocate memory from the block of shared memory.
    * arg 1) The shared memory block to destroy. 
    * arg 2) How much memory to allocate
  @@ -107,7 +107,7 @@
   }
   
   /* ***APRDOC********************************************************
  - * void *ap_shm_calloc(ap_shmem_t *, ap_size_t)
  + * void *ap_shm_calloc(ap_shmem_t *shared, ap_size_t size)
    *    allocate memory from the block of shared memory and initialize it
    *    to zero.
    * arg 1) The shared memory block to destroy. 
  @@ -122,7 +122,7 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_shm_free(ap_shmem_t *, void *)
  + * ap_status_t ap_shm_free(ap_shmem_t *shared, void *entity)
    *    free shared memory previously allocated.
    * arg 1) The shared memory block to destroy. 
    */
  @@ -133,7 +133,7 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_shm_name(ap_shmem_t *, ap_shm_name_t **)
  + * ap_status_t ap_get_shm_name(ap_shmem_t *c, ap_shm_name_t **name)
    *    Get the name of the shared memory segment if not using
    *    anonymous shared memory.
    * arg 1)  The shared memory block to destroy. 
  @@ -161,7 +161,7 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_set_shm_name(ap_shmem_t *, ap_shm_name_t *)
  + * ap_status_t ap_set_shm_name(ap_shmem_t *c, ap_shm_name_t *name)
    *    Set the name of the shared memory segment if not using
    *    anonymous shared memory.  This is to allow processes to open
    *    shared memory created by another process.
  @@ -187,7 +187,7 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_open_shmem(ap_shmem_t *)
  + * ap_status_t ap_open_shmem(ap_shmem_t *c)
    *    Open the shared memory block in a child process. 
    * arg 1)  The shared memory block to open in the child. 
    * return) This should be called after ap_set_shm_name.  The ap_shmem_t 
  @@ -211,7 +211,7 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_shm_avail(ap_shmem_t *, ap_size_t *)
  + * ap_status_t ap_shm_avail(ap_shmem_t *c, ap_size_t *size)
    *    Determine how much memory is available in the specified shared
    *    memory block
    * arg 1)  The shared memory block to open in the child. 
  
  
  
  1.17      +42 -38    apache-2.0/src/lib/apr/threadproc/unix/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/proc.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- proc.c	2000/03/10 00:06:42	1.16
  +++ proc.c	2000/03/15 17:05:11	1.17
  @@ -57,10 +57,10 @@
   #include "apr_portable.h"
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_createprocattr_init(ap_procattr_t **, ap_context_t *)
  + * ap_status_t ap_createprocattr_init(ap_procattr_t **new, ap_context_t *cont)
    *    Create and initialize a new procattr variable 
  - * arg 1) The context to use
  - * arg 2) The newly created procattr. 
  + * arg 1) The newly created procattr. 
  + * arg 2) The context to use
    */
   ap_status_t ap_createprocattr_init(struct procattr_t **new, ap_context_t *cont)
   {
  @@ -84,8 +84,8 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_setprocattr_io(ap_procattr_t *, ap_int32_t, ap_int32_t
  - *                               ap_int32_t)
  + * ap_status_t ap_setprocattr_io(ap_procattr_t *attr, ap_int32_t in, 
  + *                               ap_int32_t *out, ap_int32_t err)
    *    Determine if any of stdin, stdout, or stderr should be linked
    *    to pipes when starting a child process. 
    * arg 1) The procattr we care about. 
  @@ -147,8 +147,8 @@
   
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_setprocattr_childin(ap_procattr_t *, ap_file_t *,
  - *                                    ap_file_t *)
  + * ap_status_t ap_setprocattr_childin(ap_procattr_t *attr, ap_file_t *child_in,
  + *                                    ap_file_t *parent_in)
    *    Set the child_in and/or parent_in values to existing ap_file_t
    *    values. This is NOT a required initializer function. This is
    *    useful if you have already opened a pipe (or multiple files)
  @@ -177,8 +177,9 @@
   
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_setprocattr_childout(ap_procattr_t *, ap_file_t *,
  - *                                     ap_file_t *)
  + * ap_status_t ap_setprocattr_childout(ap_procattr_t *attr, 
  + *                                     ap_file_t *child_out, 
  + *                                     ap_file_t *parent_out)
    *    Set the child_out and parent_out values to existing ap_file_t
    *    values. This is NOT a required initializer function. This is
    *    useful if you have already opened a pipe (or multiple files)
  @@ -205,8 +206,9 @@
   
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_setprocattr_childerr(ap_procattr_t *, ap_file_t *,
  - *                                     ap_file_t *)
  + * ap_status_t ap_setprocattr_childerr(ap_procattr_t *attr, 
  + *                                     ap_file_t *child_err,
  + *                                     ap_file_t *parent_err)
    *    Set the child_err and parent_err values to existing ap_file_t
    *    values. This is NOT a required initializer function. This is
    *    useful if you have already opened a pipe (or multiple files)
  @@ -233,7 +235,7 @@
   
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_setprocattr_dir(ap_procattr_t *, char *) 
  + * ap_status_t ap_setprocattr_dir(ap_procattr_t *attr, constchar *dir) 
    *    Set which directory the child process should start executing in. 
    * arg 1) The procattr we care about. 
    * arg 2) Which dir to start in.  By default, this is the same dir as
  @@ -251,7 +253,7 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_setprocattr_cmdtype(ap_procattr_t *, ap_cmdtype_e) 
  + * ap_status_t ap_setprocattr_cmdtype(ap_procattr_t *attr, ap_cmdtype_e cmd) 
    *    Set what type of command the child process will call. 
    * arg 1) The procattr we care about. 
    * arg 2) The type of command.  One of:
  @@ -266,7 +268,7 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_setprocattr_detach(ap_procattr_t *, ap_int32_t) 
  + * ap_status_t ap_setprocattr_detach(ap_procattr_t *attr, ap_int32_t detach) 
    *    Determine if the chlid should start in detached state.
    * arg 1) The procattr we care about. 
    * arg 2) Should the child start in detached state?  Default is no. 
  @@ -278,11 +280,11 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_fork(ap_proc_t **, ap_context_t *) 
  + * ap_status_t ap_fork(ap_proc_t **proc, ap_context_t *cont) 
    *    This is currently the only non-portable call in APR.  This executes
    *    a standard unix fork.
  - * arg 1) The context to use. 
  - * arg 2) The resulting process handle. 
  + * arg 1) The resulting process handle. 
  + * arg 2) The context to use. 
    */
   ap_status_t ap_fork(struct proc_t **proc, ap_context_t *cont)
   {
  @@ -304,10 +306,11 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_create_process(ap_context_t *, const char *, char *const [],
  -                                 char **, ap_procattr_t *, ap_proc_t **) 
  + * ap_status_t ap_create_process(ap_proc_t **new, const char *progname,
  + *                               char *const args[], char **env, 
  + *                               ap_procattr_t *attr, ap_context_t *cont) 
    *    Create a new process and execute a new program within that process.
  - * arg 1) The context to use. 
  + * arg 1) The resulting process handle.
    * arg 2) The program to run 
    * arg 3) the arguments to pass to the new program.  The first one should
    *        be the program name.
  @@ -315,7 +318,7 @@
    *        list of NULL-terminated strings.
    * arg 5) the procattr we should use to determine how to create the new
    *        process
  - * arg 6) The resulting process handle.
  + * arg 6) The context to use. 
    */
   ap_status_t ap_create_process(struct proc_t **new, const char *progname, 
                                 char *const args[], char **env,
  @@ -410,10 +413,10 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_childin(ap_file_t **, ap_proc_t *) 
  + * ap_status_t ap_get_childin(ap_file_t **new, ap_proc_t *proc) 
    *    Get the file handle that is assocaited with a child's stdin.
  - * arg 1) The process handle that corresponds to the desired child process 
  - * arg 2) The returned file handle. 
  + * arg 1) The returned file handle. 
  + * arg 2) The process handle that corresponds to the desired child process 
    */
   ap_status_t ap_get_childin(ap_file_t **new, struct proc_t *proc)
   {
  @@ -422,10 +425,10 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_childout(ap_file_t **, ap_proc_t *) 
  + * ap_status_t ap_get_childout(ap_file_t **new, ap_proc_t *proc) 
    *    Get the file handle that is assocaited with a child's stdout.
  - * arg 1) The process handle that corresponds to the desired child process 
  - * arg 2) The returned file handle. 
  + * arg 1) The returned file handle. 
  + * arg 2) The process handle that corresponds to the desired child process 
    */
   ap_status_t ap_get_childout(ap_file_t **new, struct proc_t *proc)
   {
  @@ -434,10 +437,10 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_childerr(ap_file_t **, ap_proc_t *) 
  + * ap_status_t ap_get_childerr(ap_file_t **new, ap_proc_t *proc) 
    *    Get the file handle that is assocaited with a child's stderr.
  - * arg 1) The process handle that corresponds to the desired child process 
  - * arg 2) The returned file handle. 
  + * arg 1) The returned file handle. 
  + * arg 2) The process handle that corresponds to the desired child process 
    */
   ap_status_t ap_get_childerr(ap_file_t **new, struct proc_t *proc)
   {
  @@ -446,7 +449,7 @@
   }    
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_wait_proc(ap_proc_t *, ap_wait_how) 
  + * ap_status_t ap_wait_proc(ap_proc_t *proc, ap_wait_how waithow) 
    *    Wait for a child process to die 
    * arg 1) The process handle that corresponds to the desired child process 
    * arg 2) How should we wait.  One of:
  @@ -483,10 +486,10 @@
   } 
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_os_proc(ap_os_proc_t *, ap_proc_t *)
  + * ap_status_t ap_get_os_proc(ap_os_proc_t *theproc, ap_proc_t *proc)
    *    convert the proc from os specific type to apr type.
  - * arg 1) The apr proc to converting
  - * arg 2) The os specific proc we are converting to
  + * arg 1) The os specific proc we are converting to
  + * arg 2) The apr proc we are converting
    */
   ap_status_t ap_get_os_proc(ap_os_proc_t *theproc, ap_proc_t *proc)
   {
  @@ -498,11 +501,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_put_os_proc(ap_context_t *, ap_proc_t *, ap_os_proc_t *)
  + * ap_status_t ap_put_os_proc(ap_proc_t *proc, ap_os_proc_t *theproc,
  + *                            ap_context_t *cont)
    *    convert the proc from os specific type to apr type.
  - * arg 1) The context to use if it is needed.
  - * arg 2) The apr proc we are converting to.
  - * arg 3) The os specific proc to convert
  + * arg 1) The apr proc we are converting to.
  + * arg 2) The os specific proc to convert
  + * arg 3) The context to use if it is needed.
    */
   ap_status_t ap_put_os_proc(struct proc_t **proc, ap_os_proc_t *theproc, 
                              ap_context_t *cont)
  
  
  
  1.11      +12 -9     apache-2.0/src/lib/apr/threadproc/unix/procsup.c
  
  Index: procsup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/procsup.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- procsup.c	2000/03/10 00:06:43	1.10
  +++ procsup.c	2000/03/15 17:05:11	1.11
  @@ -56,10 +56,10 @@
   #include "threadproc.h"
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_detach(ap_context_t *, ap_proc_t *)
  + * ap_status_t ap_detach(ap_proc_t **new, ap_context_t *cont)
    *    Detach the process from the controlling terminal.
  - * arg 1) The context to use if it is needed.
  - * arg 2) The new process handler
  + * arg 1) The new process handler
  + * arg 2) The context to use if it is needed.
    */
   ap_status_t ap_detach(struct proc_t **new, ap_context_t *cont)
   {
  @@ -126,10 +126,11 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_procdata(char *, void *, ap_proc_t *)
  + * ap_status_t ap_get_procdata(char *key, void *data, ap_proc_t *proc)
    *    Return the context associated with the current proc.
  - * arg 1) The currently open proc.
  + * arg 1) The key associated with the data to retreive.
    * arg 2) The user data associated with the proc.
  + * arg 3) The currently open proc.
    */
   ap_status_t ap_get_procdata(char *key, void *data, struct proc_t *proc)
   {
  @@ -143,11 +144,13 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_set_procdata(ap_proc_t *, void *, char *key,
  -                               ap_status_t (*cleanup) (void *))
  + * ap_status_t ap_set_procdata(void *data, char *key,
  + *                             ap_status_t (*cleanup) (void *), ap_proc_t *proc)
    *    Return the context associated with the current proc.
  - * arg 1) The currently open proc.
  - * arg 2) The user data to associate with the proc.
  + * arg 2) The user data to associate with the file.
  + * arg 3) The key to use for assocaiteing data with the file.
  + * arg 4) The cleanup routine to use when the file is destroyed.
  + * arg 1) The current process.
   */
   ap_status_t ap_set_procdata(void *data, char *key, 
                               ap_status_t (*cleanup) (void *),
  
  
  
  1.5       +6 -0      apache-2.0/src/lib/apr/threadproc/unix/signals.c
  
  Index: signals.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/signals.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- signals.c	2000/03/10 00:06:43	1.4
  +++ signals.c	2000/03/15 17:05:11	1.5
  @@ -55,6 +55,12 @@
   
   #include "threadproc.h"
   
  +/* ***APRDOC********************************************************
  + * ap_status_t ap_kill(ap_proc_t *proc, int sig)
  + *    Terminate a process.
  + * arg 1) The process to terminate.
  + * arg 2) How to kill the process.
  + */
   ap_status_t ap_kill(struct proc_t *proc, int sig)
   {
       if (kill(proc->pid, sig) == -1) {
  
  
  
  1.12      +32 -27    apache-2.0/src/lib/apr/threadproc/unix/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/thread.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- thread.c	2000/03/10 00:06:43	1.11
  +++ thread.c	2000/03/15 17:05:11	1.12
  @@ -60,10 +60,10 @@
   
   #ifdef HAVE_PTHREAD_H
   /* ***APRDOC********************************************************
  - * ap_status_t ap_create_threadattr(ap_threadattr_t **, ap_context_t *)
  + * ap_status_t ap_create_threadattr(ap_threadattr_t **new, ap_context_t *cont)
    *    Create and initialize a new threadattr variable
  - * arg 1) The context to use
  - * arg 2) The newly created threadattr.
  + * arg 1) The newly created threadattr.
  + * arg 2) The context to use
    */
   ap_status_t ap_create_threadattr(struct threadattr_t **new, ap_context_t *cont)
   {
  @@ -88,7 +88,7 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_setthreadattr_detach(ap_threadattr_t *, ap_int32_t)
  + * ap_status_t ap_setthreadattr_detach(ap_threadattr_t *attr, ap_int32_t on)
    *    Set if newly created threads should be created in detach mode.
    * arg 1) The threadattr to affect 
    * arg 2) Thread detach state on or off
  @@ -105,10 +105,9 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_getthreadattr_detach(ap_threadattr_t *, ap_int32_t *)
  + * ap_status_t ap_getthreadattr_detach(ap_threadattr_t *attr)
    *    Get the detach mode for this threadattr.
    * arg 1) The threadattr to reference 
  - * arg 2) Thread detach state on or off
    */
   ap_status_t ap_getthreadattr_detach(struct threadattr_t *attr)
   {
  @@ -121,14 +120,15 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_create_thread(ap_context_t *, ap_threadattr_t *, 
  - *                              ap_thread_start_t, coid *, ap_thread_t **)
  + * ap_status_t ap_create_thread(ap_thread_t **new, ap_threadattr_t *attr, 
  + *                              ap_thread_start_t func, void *data, 
  + *                              ap_context_t *cont)
    *    Create a new thread of execution 
  - * arg 1) The context to use
  + * arg 1) The newly created thread handle.
    * arg 2) The threadattr to use to determine how to create the thread
    * arg 3) The function to start the new thread in
    * arg 4) Any data to be passed to the starting function
  - * arg 5) The newly created thread handle.
  + * arg 5) The context to use
    */
   ap_status_t ap_create_thread(struct thread_t **new, struct threadattr_t *attr, 
                                ap_thread_start_t func, void *data, 
  @@ -170,7 +170,7 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_thread_exit(ap_thread_t *, ap_status_t *)
  + * ap_status_t ap_thread_exit(ap_thread_t *thd, ap_status_t *retval)
    *    stop the current thread 
    * arg 1) The thread to stop
    * arg 2) The return value to pass back to any thread that cares
  @@ -183,10 +183,10 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_thread_join(ap_status_t *, ap_thread_t *)
  + * ap_status_t ap_thread_join(ap_status_t *retval, ap_thread_t *thd)
    *    block until the desired thread stops executing. 
  - * arg 1) The thread to join
  - * arg 2) The return value from the dead thread.
  + * arg 1) The return value from the dead thread.
  + * arg 2) The thread to join
    */
   ap_status_t ap_thread_join(ap_status_t *retval, struct thread_t *thd)
   {
  @@ -201,7 +201,7 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_thread_detach(ap_thread_t *)
  + * ap_status_t ap_thread_detach(ap_thread_t *thd)
    *    detach a thread
    * arg 1) The thread to detach 
    */
  @@ -218,10 +218,11 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_threaddata(void **, char *, ap_thread_t *)
  + * ap_status_t ap_get_threaddata(void **data, char *key, ap_thread_t *thread)
    *    Return the context associated with the current thread.
  - * arg 1) The currently open thread.
  - * arg 2) The user data associated with the thread.
  + * arg 1) The user data associated with the thread.
  + * arg 2) The key to associate with the data
  + * arg 3) The currently open thread.
    */
   ap_status_t ap_get_threaddata(void **data, char *key, struct thread_t *thread)
   {
  @@ -235,11 +236,14 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_set_threaddata(ap_thread_t *, void *, char *key,
  -                                 ap_status_t (*cleanup) (void *))
  + * ap_status_t ap_set_threaddata(void *data, char *key,
  +                                 ap_status_t (*cleanup) (void *),
  +                                 ap_thread_t *thread)
    *    Return the context associated with the current thread.
  - * arg 1) The currently open thread.
  - * arg 2) The user data to associate with the thread.
  + * arg 1) The user data to associate with the thread.
  + * arg 2) The key to use for associating the data with the tread
  + * arg 3) The cleanup routine to use when the thread is destroyed.
  + * arg 4) The currently open thread.
    */
   ap_status_t ap_set_threaddata(void *data, char *key,
                                 ap_status_t (*cleanup) (void *),
  @@ -255,7 +259,7 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_os_thread(ap_thread_t *, ap_os_thread_t *)
  + * ap_status_t ap_get_os_thread(ap_thread_t *thethd, ap_os_thread_t *thd)
    *    convert the thread to os specific type from apr type.
    * arg 1) The apr thread to convert
    * arg 2) The os specific thread we are converting to
  @@ -270,11 +274,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_put_os_thread(ap_context_t *, ap_thread_t *, ap_os_thread_t *)
  + * ap_status_t ap_put_os_thread(ap_thread_t *thd, ap_os_thread_t *thethd,
  + *                              ap_context_t *cont)
    *    convert the thread from os specific type to apr type.
  - * arg 1) The context to use if it is needed.
  - * arg 2) The apr thread we are converting to.
  - * arg 3) The os specific thread to convert
  + * arg 1) The apr thread we are converting to.
  + * arg 2) The os specific thread to convert
  + * arg 3) The context to use if it is needed.
    */
   ap_status_t ap_put_os_thread(struct thread_t **thd, ap_os_thread_t *thethd, 
                                ap_context_t *cont)
  
  
  
  1.7       +7 -7      apache-2.0/src/lib/apr/threadproc/unix/threadcancel.c
  
  Index: threadcancel.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/threadcancel.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- threadcancel.c	2000/03/10 00:06:44	1.6
  +++ threadcancel.c	2000/03/15 17:05:12	1.7
  @@ -60,7 +60,7 @@
   
   #if 0 /* some platforms, e.g. FreeBSD 2.2.8, do not have pthread_cancel (they do have an
undocumented pthread_kill, though) */
   /* ***APRDOC********************************************************
  - * ap_status_t ap_cancel_thread(ap_thread_t *)
  + * ap_status_t ap_cancel_thread(ap_thread_t *thd)
    *    Asynchronously kill a thread
    * arg 1) The thread to kill.
    */
  @@ -77,12 +77,12 @@
   #endif
       
   /* ***APRDOC********************************************************
  - * ap_status_t ap_setcanceltype(ap_int32_t, ap_context_t *)
  + * ap_status_t ap_setcanceltype(ap_int32_t type, ap_context_t *cont)
    *    Determine how threads are cancelable.
  - * arg 1) The context to operate on 
  - * arg 2) how are threads cancelable.  One of:
  + * arg 1) how are threads cancelable.  One of:
    *            APR_CANCEL_ASYNCH  -- cancel it no matter where it is
    *            APR_CANCEL_DEFER   -- only cancel the thread if it is safe. 
  + * arg 2) The context to operate on 
    */
   ap_status_t ap_setcanceltype(ap_int32_t type, ap_context_t *cont)
   {
  @@ -96,10 +96,10 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_setcancelstate(ap_int32_t, ap_context_t *)
  + * ap_status_t ap_setcancelstate(ap_int32_t type, ap_context_t *cont)
    *    Determine if threads will be cancelable.
  - * arg 1) The context to operate on 
  - * arg 2) Are threads cancelable. 
  + * arg 1) Are threads cancelable. 
  + * arg 2) The context to operate on 
    */
   ap_status_t ap_setcancelstate(ap_int32_t type, ap_context_t *cont)
   {
  
  
  
  1.11      +29 -23    apache-2.0/src/lib/apr/threadproc/unix/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/threadpriv.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- threadpriv.c	2000/03/10 00:06:44	1.10
  +++ threadpriv.c	2000/03/15 17:05:12	1.11
  @@ -60,12 +60,13 @@
   
   #ifdef HAVE_PTHREAD_H
   /* ***APRDOC********************************************************
  - * ap_status_t ap_create_thread_private(ap_context_t *, void *(void *),
  - *                                      ap_key_t)
  + * ap_status_t ap_create_thread_private(ap_threadkey_t **key, 
  + *                                      void (*dest)(void *),
  + *                                      ap_context_t *cont)
    *    Create and initialize a new thread private address space
  - * arg 1) The context to use
  + * arg 1) The thread private handle.
    * arg 2) The destructor to use when freeing the private memory.
  - * arg 3) The thread private handle.
  + * arg 3) The context to use
    */
   ap_status_t ap_create_thread_private(struct threadkey_t **key, 
                                        void (*dest)(void *), ap_context_t *cont)
  @@ -86,10 +87,10 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_thread_private(void **, ap_key_t *)
  + * ap_status_t ap_get_thread_private(void **new, ap_key_t *key)
    *    Get a pointer to the thread private memory
  - * arg 1) The handle for the desired thread private memory 
  - * arg 2) The data stored in private memory 
  + * arg 1) The data stored in private memory 
  + * arg 2) The handle for the desired thread private memory 
    */
   ap_status_t ap_get_thread_private(void **new, struct threadkey_t *key)
   {
  @@ -98,10 +99,10 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_set_thread_private(void *, ap_key_t *)
  + * ap_status_t ap_set_thread_private(void *priv, ap_key_t *key)
    *    Set the data to be stored in thread private memory
  - * arg 1) The handle for the desired thread private memory 
  - * arg 2) The data to be stored in private memory 
  + * arg 1) The data to be stored in private memory 
  + * arg 2) The handle for the desired thread private memory 
    */
   ap_status_t ap_set_thread_private(void *priv, struct threadkey_t *key)
   {
  @@ -115,7 +116,7 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_delete_thread_private(ap_key_t *)
  + * ap_status_t ap_delete_thread_private(ap_key_t *key)
    *    Free the thread private memory
    * arg 1) The handle for the desired thread private memory 
    */
  @@ -129,10 +130,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_threadkeydata(void **, char *, ap_threadkey_t *)
  + * ap_status_t ap_get_threadkeydata(void **data, char *key, 
  + *                                  ap_threadkey_t *threadkey)
    *    Return the context associated with the current threadkey.
  - * arg 1) The currently open threadkey.
  - * arg 2) The user data associated with the threadkey.
  + * arg 1) The user data associated with the threadkey.
  + * arg 2) The key associated with the data
  + * arg 3) The currently open threadkey.
    */
   ap_status_t ap_get_threadkeydata(void **data, char *key, struct threadkey_t *threadkey)
   {
  @@ -146,11 +149,14 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_set_threadkeydata(ap_threadkey_t *, void *, char *key,
  -                                    ap_status_t (*cleanup) (void *))
  + * ap_status_t ap_set_threadkeydata(void *data, char *key,
  +                                    ap_status_t (*cleanup) (void *),
  +                                    ap_threadkey_t *threadkey)
    *    Return the context associated with the current threadkey.
  - * arg 1) The currently open threadkey.
  + * arg 1) The data to set.
  + * arg 1) The key to associate with the data.
    * arg 2) The user data to associate with the threadkey.
  + * arg 1) The currently open threadkey.
    */
   ap_status_t ap_set_threadkeydata(void *data,
                                    char *key, ap_status_t (*cleanup) (void *),
  @@ -166,7 +172,7 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_os_threadkey(ap_key_t *, ap_os_threadkey_t *)
  + * ap_status_t ap_get_os_threadkey(ap_key_t *thekey, ap_os_threadkey_t *key)
    *    convert the thread private memory key to os specific type 
    *    from an apr type.
    * arg 1) The apr handle we are converting from.
  @@ -182,12 +188,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_put_os_threadkey(ap_context_t *, ap_key_t *, 
  - *                                 ap_os_threadkey_t *)
  + * ap_status_t ap_put_os_threadkey(ap_key_t *key, ap_os_threadkey_t *thekey, 
  + *                                 ap_context_t *cont)
    *    convert the thread private memory key from os specific type to apr type.
  - * arg 1) The context to use if it is needed.
  - * arg 2) The apr handle we are converting to.
  - * arg 3) The os specific handle to convert
  + * arg 1) The apr handle we are converting to.
  + * arg 2) The os specific handle to convert
  + * arg 3) The context to use if it is needed.
    */
   ap_status_t ap_put_os_threadkey(struct threadkey_t **key, 
                                   ap_os_threadkey_t *thekey, ap_context_t *cont)
  
  
  
  1.21      +7 -7      apache-2.0/src/lib/apr/time/unix/time.c
  
  Index: time.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/time.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- time.c	2000/03/10 00:06:47	1.20
  +++ time.c	2000/03/15 17:05:13	1.21
  @@ -96,7 +96,7 @@
   
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_explode_gmt(ap_exploded_time_t *, ap_time_t)
  + * ap_status_t ap_explode_gmt(ap_exploded_time_t *result, ap_time_t input)
    *   convert a time to its human readable components in GMT timezone
    * arg 1) the exploded time
    * arg 2) the time to explode
  @@ -121,7 +121,7 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_explode_localtime(ap_exploded_time_t *, ap_time_t)
  + * ap_status_t ap_explode_localtime(ap_exploded_time_t *result, ap_time_t input)
    *   convert a time to its human readable components in local timezone
    * arg 1) the exploded time
    * arg 2) the time to explode
  @@ -184,7 +184,7 @@
   
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_implode_time(ap_time_t *, ap_exploded_time_t *)
  + * ap_status_t ap_implode_time(ap_time_t *t, ap_exploded_time_t *xt)
    *    Convert time value from human readable format to number of seconds 
    *    since epoch
    * arg 1) the resulting imploded time
  @@ -225,7 +225,7 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_os_imp_time(ap_os_imp_time_t **, ap_time_t *)
  + * ap_status_t ap_get_os_imp_time(ap_os_imp_time_t **ostime, ap_time_t *aprtime)
    *    Get the imploded time in the platforms native format.
    * arg 1) the native time format
    * arg 2) the time to convert
  @@ -238,7 +238,7 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_os_exp_time(ap_os_exp_time_t **, ap_exploded_time_t *)
  + * ap_status_t ap_get_os_exp_time(ap_os_exp_time_t **ostime, ap_exploded_time_t *aprtime)
    *    Get the exploded time in the platforms native format.
    * arg 1) the native time format
    * arg 2) the time to convert
  @@ -258,7 +258,7 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_put_os_imp_time(ap_time_t *, ap_os_imp_time_t **, ap_context_t, *cont)
  + * ap_status_t ap_put_os_imp_time(ap_time_t *aprtime, ap_os_imp_time_t **ostime, ap_context_t,
*cont)
    *    Put the imploded time in the APR format.
    * arg 1) the APR time format
    * arg 2) the time to convert
  @@ -272,7 +272,7 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_put_os_exp_time(ap_exploded_time_t *, ap_os_exp_time_t **, ap_context_t,
*cont)
  + * ap_status_t ap_put_os_exp_time(ap_exploded_time_t *aprtime, ap_os_exp_time_t **ostime,
ap_context_t, *cont)
    *    Put the exploded time in the APR format.
    * arg 1) the APR time format
    * arg 2) the time to convert
  
  
  

Mime
View raw message