httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dr...@hyperreal.org
Subject cvs commit: apache-2.0/src/lib/apr/threadproc/beos proc.c procsup.c signals.c thread.c threadcancel.c threadpriv.c threadproc.h
Date Wed, 15 Dec 1999 13:07:33 GMT
dreid       99/12/15 05:07:33

  Modified:    src/lib/apr/file_io/unix pipe.c
               src/lib/apr/locks/beos crossproc.c intraproc.c locks.c
                        locks.h
               src/lib/apr/mmap/beos mmap.c mmap_h.h
               src/lib/apr/network_io/beos inet_aton.c networkio.h poll.c
                        sendrecv.c sockaddr.c sockets.c sockopt.c
               src/lib/apr/threadproc/beos proc.c procsup.c signals.c
                        thread.c threadcancel.c threadpriv.c threadproc.h
  Log:
  Update the BeOS files to use a single header.
  BeOS can't use the same non-blocking code as Unix for pipes, so
  until I can add the appropriate code I'm commenting it out for BeOS.
  
  Revision  Changes    Path
  1.9       +6 -2      apache-2.0/src/lib/apr/file_io/unix/pipe.c
  
  Index: pipe.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/pipe.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- pipe.c	1999/12/03 15:18:23	1.8
  +++ pipe.c	1999/12/15 13:07:21	1.9
  @@ -57,6 +57,7 @@
   
   static ap_status_t pipenonblock(struct file_t *thefile)
   {
  +#ifndef BEOS /* this code won't work on BeOS */
       int fd_flags;
   
       fd_flags = fcntl(thefile->filedes, F_GETFL, 0);
  @@ -66,13 +67,14 @@
       fd_flags |= O_NDELAY;
   #elif defined(FNDELAY)
       fd_flags |= O_FNDELAY;
  -#else
  +#else */
       /* XXXX: this breaks things, but an alternative isn't obvious...*/
       return -1;
   #endif
       if (fcntl(thefile->filedes, F_SETFL, fd_flags) == -1) {
           return errno;
       }
  +#endif /* !BeOS */
       return APR_SUCCESS;
   }
   
  @@ -153,6 +155,7 @@
   
   ap_status_t ap_block_pipe(ap_file_t *thefile)
   {
  +#ifndef BEOS /* this code won't work on BeOS */
       int fd_flags;
   
       fd_flags = fcntl(thefile->filedes, F_GETFL, 0);
  @@ -162,13 +165,14 @@
       fd_flags &= ~O_NDELAY;
   #elif defined(FNDELAY)
       fd_flags &= ~O_FNDELAY;
  -#else
  +#else 
       /* XXXX: this breaks things, but an alternative isn't obvious...*/
       return -1;
   #endif
       if (fcntl(thefile->filedes, F_SETFL, fd_flags) == -1) {
           return errno;
       }
  +#endif /* !BeOS */
       return APR_SUCCESS;
   }
       
  
  
  
  1.4       +0 -3      apache-2.0/src/lib/apr/locks/beos/crossproc.c
  
  Index: crossproc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/crossproc.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- crossproc.c	1999/10/13 22:49:51	1.3
  +++ crossproc.c	1999/12/15 13:07:22	1.4
  @@ -53,9 +53,6 @@
    *
    */
   
  -#include "apr_lock.h"
  -#include "apr_general.h"
  -#include "apr_lib.h"
   #include "locks.h"
   
   ap_status_t lock_inter_cleanup(void * data)
  
  
  
  1.4       +0 -3      apache-2.0/src/lib/apr/locks/beos/intraproc.c
  
  Index: intraproc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/intraproc.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- intraproc.c	1999/10/13 22:49:52	1.3
  +++ intraproc.c	1999/12/15 13:07:22	1.4
  @@ -53,10 +53,7 @@
    *
    */
   
  -#include "apr_lock.h"
  -#include "apr_general.h"
   #include "locks.h"
  -#include "apr_lib.h"
   
   ap_status_t lock_intra_cleanup(void *data)
   {
  
  
  
  1.7       +0 -4      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- locks.c	1999/11/05 21:26:13	1.6
  +++ locks.c	1999/12/15 13:07:22	1.7
  @@ -53,11 +53,7 @@
    *
    */
   
  -#include "apr_lock.h"
  -#include "apr_general.h"
   #include "locks.h"
  -#include <strings.h>
  -#include <stdio.h>
   
   ap_status_t ap_create_lock(struct lock_t **lock, ap_locktype_e type, 
                              ap_lockscope_e scope, char *fname, 
  
  
  
  1.2       +2 -0      apache-2.0/src/lib/apr/locks/beos/locks.h
  
  Index: locks.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/locks.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- locks.h	1999/08/17 15:59:42	1.1
  +++ locks.h	1999/12/15 13:07:22	1.2
  @@ -58,6 +58,8 @@
   #include <kernel/OS.h>
   #include "apr_lock.h"
   #include "apr_file_io.h"
  +#include "apr_general.h"
  +#include "apr_lib.h"
   
   struct lock_t {
       ap_context_t *cntxt;
  
  
  
  1.6       +0 -9      apache-2.0/src/lib/apr/mmap/beos/mmap.c
  
  Index: mmap.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/beos/mmap.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mmap.c	1999/11/13 00:07:16	1.5
  +++ mmap.c	1999/12/15 13:07:24	1.6
  @@ -54,15 +54,6 @@
    */
   
   #include "mmap_h.h"
  -#include "apr_mmap.h"
  -#include "apr_general.h"
  -#include "apr_portable.h"
  -#include "apr_lib.h"
  -#include "fileio.h"
  -#include <kernel/OS.h>
  -#include <errno.h>
  -#include <string.h>
  -#include <stdio.h>
   
   ap_status_t mmap_cleanup(void *themmap)
   {
  
  
  
  1.4       +9 -2      apache-2.0/src/lib/apr/mmap/beos/mmap_h.h
  
  Index: mmap_h.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/beos/mmap_h.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mmap_h.h	1999/11/13 00:07:17	1.3
  +++ mmap_h.h	1999/12/15 13:07:24	1.4
  @@ -56,11 +56,18 @@
   #ifndef MMAP_H_H
   #define MMAP_H_H
   
  -#include <sys/stat.h>
  -#include <kernel/OS.h>
   #include "apr_general.h"
   #include "apr_mmap.h"
   #include "apr_errno.h"
  +#include "apr_general.h"
  +#include "apr_portable.h"
  +#include "apr_lib.h"
  +#include "fileio.h"
  +#include <sys/stat.h>
  +#include <kernel/OS.h>
  +#include <errno.h>
  +#include <string.h>
  +#include <stdio.h>
   
   struct mmap_t {
       ap_context_t *cntxt;
  
  
  
  1.2       +0 -2      apache-2.0/src/lib/apr/network_io/beos/inet_aton.c
  
  Index: inet_aton.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/inet_aton.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- inet_aton.c	1999/10/02 23:11:36	1.1
  +++ inet_aton.c	1999/12/15 13:07:26	1.2
  @@ -68,8 +68,6 @@
    * SOFTWARE.
    */
   
  -#include <socket.h>
  -#include <stdlib.h>
   #include "networkio.h"
   
   /* BeOS doesn't yet have it's own inet_aton and Bind won't be ported
  
  
  
  1.8       +10 -0     apache-2.0/src/lib/apr/network_io/beos/networkio.h
  
  Index: networkio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/networkio.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- networkio.h	1999/10/24 12:27:33	1.7
  +++ networkio.h	1999/12/15 13:07:26	1.8
  @@ -58,6 +58,16 @@
   
   #include <socket.h>
   #include <netdb.h>
  +#include <errno.h>
  +#include <string.h>
  +#include <stdlib.h>
  +#include <sys/time.h>
  +#include "apr_network_io.h"
  +#include "apr_general.h"
  +#include "apr_portable.h"
  +#include "apr_lib.h"
  +#include "fileio.h"
  +#include "apr_errno.h"
   
   /* The definition of isascii was missed from the PowerPC ctype.h
    *
  
  
  
  1.7       +0 -3      apache-2.0/src/lib/apr/network_io/beos/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/poll.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- poll.c	1999/10/15 14:20:07	1.6
  +++ poll.c	1999/12/15 13:07:26	1.7
  @@ -55,9 +55,6 @@
   
   
   #include "networkio.h"
  -#include "apr_network_io.h"
  -#include "networkio.h"
  -#include "apr_general.h"
   
   /*  BeOS R4 doesn't have a poll function, but R5 will have */
   /*  so for the time being we try our best with an implementaion that */
  
  
  
  1.3       +0 -7      apache-2.0/src/lib/apr/network_io/beos/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sendrecv.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sendrecv.c	1999/10/02 23:11:36	1.2
  +++ sendrecv.c	1999/12/15 13:07:26	1.3
  @@ -55,14 +55,7 @@
    *
    */
   
  -#include <sys/time.h>
  -#include <socket.h>
  -#include <netdb.h>
   #include "networkio.h"
  -#include "fileio.h"
  -#include "apr_errno.h"
  -#include "apr_general.h"
  -#include "apr_network_io.h"
   
   ap_status_t ap_send(struct socket_t *sock, const char *buf, ap_ssize_t *len)
   {
  
  
  
  1.3       +0 -6      apache-2.0/src/lib/apr/network_io/beos/sockaddr.c
  
  Index: sockaddr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockaddr.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- sockaddr.c	1999/12/12 17:18:57	1.2
  +++ sockaddr.c	1999/12/15 13:07:27	1.3
  @@ -54,12 +54,6 @@
    */
   
   #include "networkio.h"
  -#include "apr_network_io.h"
  -#include "apr_general.h"
  -#include "apr_lib.h"
  -#include <errno.h>
  -#include <string.h>
  -#include <sys/socket.h>
   
   ap_status_t ap_set_local_port(struct socket_t *sock, ap_uint32_t port)
   {
  
  
  
  1.16      +0 -8      apache-2.0/src/lib/apr/network_io/beos/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockets.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- sockets.c	1999/11/02 21:49:25	1.15
  +++ sockets.c	1999/12/15 13:07:27	1.16
  @@ -53,15 +53,7 @@
    *
    */
   
  -#include <errno.h>
  -#include <string.h>
  -#include <socket.h>
  -#include <netdb.h>
   #include "networkio.h"
  -#include "apr_network_io.h"
  -#include "apr_general.h"
  -#include "apr_portable.h"
  -#include "apr_lib.h"
   
   ap_status_t socket_cleanup(void *sock)
   {
  
  
  
  1.10      +0 -9      apache-2.0/src/lib/apr/network_io/beos/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockopt.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- sockopt.c	1999/10/24 12:27:33	1.9
  +++ sockopt.c	1999/12/15 13:07:28	1.10
  @@ -53,16 +53,7 @@
    *
    */
   
  -#include <errno.h>
  -#include <string.h>
  -#include <sys/socket.h>
  -#include <unistd.h>
  -#include <fcntl.h>
  -#include <netdb.h>
   #include "networkio.h"
  -#include "apr_network_io.h"
  -#include "apr_general.h"
  -#include "apr_lib.h"
   
   ap_status_t ap_setsocketopt(struct socket_t *sock, ap_int32_t opt, ap_int32_t on)
   {
  
  
  
  1.14      +0 -7      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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- proc.c	1999/12/15 12:35:15	1.13
  +++ proc.c	1999/12/15 13:07:30	1.14
  @@ -54,14 +54,7 @@
    */
   
   
  -#include <signal.h>
  -#include <string.h>
  -#include <sys/wait.h>
   #include "threadproc.h"
  -#include "apr_thread_proc.h"
  -#include "apr_file_io.h"
  -#include "apr_general.h"
  -#include "apr_portable.h"
   
   struct send_pipe {
   	int in;
  
  
  
  1.7       +0 -7      apache-2.0/src/lib/apr/threadproc/beos/procsup.c
  
  Index: procsup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/procsup.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- procsup.c	1999/10/15 14:20:20	1.6
  +++ procsup.c	1999/12/15 13:07:30	1.7
  @@ -54,13 +54,6 @@
    */
   
   #include "threadproc.h"
  -#include "fileio.h"
  -
  -#include "apr_config.h"
  -#include "apr_thread_proc.h"
  -#include "apr_file_io.h"
  -#include "apr_general.h"
  -#include "apr_lib.h"
   
   ap_status_t ap_detach(struct proc_t **new, ap_context_t *cont)
   {
  
  
  
  1.2       +0 -7      apache-2.0/src/lib/apr/threadproc/beos/signals.c
  
  Index: signals.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/signals.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- signals.c	1999/08/17 15:59:49	1.1
  +++ signals.c	1999/12/15 13:07:31	1.2
  @@ -54,13 +54,6 @@
    */
   
   #include "threadproc.h"
  -#include "fileio.h"
  -#include "apr_thread_proc.h"
  -#include "apr_file_io.h"
  -#include "apr_general.h"
  -#include <signal.h>
  -#include <string.h>
  -#include <sys/wait.h>
   
   ap_status_t ap_kill(struct proc_t *proc, int signal)
   {
  
  
  
  1.5       +0 -3      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- thread.c	1999/10/11 17:52:06	1.4
  +++ thread.c	1999/12/15 13:07:31	1.5
  @@ -54,9 +54,6 @@
    */
   
   #include "threadproc.h"
  -#include "apr_thread_proc.h"
  -#include "apr_general.h"
  -
   
   ap_status_t ap_create_threadattr(struct threadattr_t **new, ap_context_t *cont)
   {
  
  
  
  1.3       +0 -2      apache-2.0/src/lib/apr/threadproc/beos/threadcancel.c
  
  Index: threadcancel.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/threadcancel.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- threadcancel.c	1999/10/11 17:52:06	1.2
  +++ threadcancel.c	1999/12/15 13:07:31	1.3
  @@ -54,8 +54,6 @@
    */
   
   #include "threadproc.h"
  -#include "apr_thread_proc.h"
  -#include "apr_general.h"
   
   
   ap_status_t ap_cancel_thread(struct thread_t *thd)
  
  
  
  1.4       +0 -3      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- threadpriv.c	1999/10/11 17:52:07	1.3
  +++ threadpriv.c	1999/12/15 13:07:31	1.4
  @@ -54,9 +54,6 @@
    */
   
   #include "threadproc.h"
  -#include "apr_thread_proc.h"
  -#include "apr_general.h"
  -#include "apr_errno.h"
   
   static struct beos_key key_table[BEOS_MAX_DATAKEYS];
   static struct beos_private_data *beos_data[BEOS_MAX_DATAKEYS];
  
  
  
  1.5       +7 -0      apache-2.0/src/lib/apr/threadproc/beos/threadproc.h
  
  Index: threadproc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/threadproc.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- threadproc.h	1999/10/22 22:30:44	1.4
  +++ threadproc.h	1999/12/15 13:07:31	1.5
  @@ -56,7 +56,14 @@
   #include "apr_thread_proc.h"
   #include "fileio.h"
   #include "apr_file_io.h"
  +#include "apr_thread_proc.h"
  +#include "apr_file_io.h"
  +#include "apr_general.h"
  +#include "apr_portable.h"
   #include  <kernel/OS.h>
  +#include <signal.h>
  +#include <string.h>
  +#include <sys/wait.h>
   
   #ifndef THREAD_PROC_H
   #define THREAD_PROC_H
  
  
  

Mime
View raw message