apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dr...@apache.org
Subject cvs commit: apr/test testpoll.c Makefile.in
Date Thu, 22 Mar 2001 21:50:13 GMT
dreid       01/03/22 13:50:12

  Modified:    include/arch/unix networkio.h
               network_io/unix poll.c
               network_io/beos poll.c
               test     Makefile.in
  Added:       test     testpoll.c
  Log:
  Change the way select based poll works so it works as we'd expect it to, i.e.
  the same way as poll.  Also add a test program specifically for poll.
  
  Revision  Changes    Path
  1.39      +3 -0      apr/include/arch/unix/networkio.h
  
  Index: networkio.h
  ===================================================================
  RCS file: /home/cvs/apr/include/arch/unix/networkio.h,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- networkio.h	2001/02/25 20:39:32	1.38
  +++ networkio.h	2001/03/22 21:50:06	1.39
  @@ -144,6 +144,9 @@
       fd_set *write;
       fd_set *except;
       int highsock;
  +    fd_set *read_set;
  +    fd_set *write_set;
  +    fd_set *except_set;
   #endif
       apr_int16_t *events;
       apr_int16_t *revents;
  
  
  
  1.45      +23 -13    apr/network_io/unix/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/unix/poll.c,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- poll.c	2001/02/16 04:16:02	1.44
  +++ poll.c	2001/03/22 21:50:08	1.45
  @@ -232,9 +232,15 @@
       (*new)->read = (fd_set *)apr_pcalloc(cont, sizeof(fd_set));
       (*new)->write = (fd_set *)apr_pcalloc(cont, sizeof(fd_set));
       (*new)->except = (fd_set *)apr_pcalloc(cont, sizeof(fd_set));
  +    (*new)->read_set = (fd_set *)apr_pcalloc(cont, sizeof(fd_set));
  +    (*new)->write_set = (fd_set *)apr_pcalloc(cont, sizeof(fd_set));
  +    (*new)->except_set = (fd_set *)apr_pcalloc(cont, sizeof(fd_set));
       FD_ZERO((*new)->read);
       FD_ZERO((*new)->write);
       FD_ZERO((*new)->except);
  +    FD_ZERO((*new)->read_set);
  +    FD_ZERO((*new)->write_set);
  +    FD_ZERO((*new)->except_set);
       (*new)->highsock = -1;
       return APR_SUCCESS;
   }
  @@ -243,13 +249,13 @@
                                  apr_socket_t *sock, apr_int16_t event)
   {
       if (event & APR_POLLIN) {
  -        FD_SET(sock->socketdes, aprset->read);
  +        FD_SET(sock->socketdes, aprset->read_set);
       }
       if (event & APR_POLLPRI) {
  -        FD_SET(sock->socketdes, aprset->except);
  +        FD_SET(sock->socketdes, aprset->except_set);
       }
       if (event & APR_POLLOUT) {
  -        FD_SET(sock->socketdes, aprset->write);
  +        FD_SET(sock->socketdes, aprset->write_set);
       }
       if (sock->socketdes > aprset->highsock) {
           aprset->highsock = sock->socketdes;
  @@ -262,13 +268,13 @@
                                     apr_int16_t events)
   {
       if (events & APR_POLLIN) {
  -        FD_CLR(sock->socketdes, aprset->read);
  +        FD_CLR(sock->socketdes, aprset->read_set);
       }
       if (events & APR_POLLPRI) {
  -        FD_CLR(sock->socketdes, aprset->except);
  +        FD_CLR(sock->socketdes, aprset->except_set);
       }
       if (events & APR_POLLOUT) {
  -        FD_CLR(sock->socketdes, aprset->write);
  +        FD_CLR(sock->socketdes, aprset->write_set);
       }
       return APR_SUCCESS;
   }
  @@ -288,6 +294,10 @@
           tvptr = &tv;
       }
   
  +    memcpy(aprset->read, aprset->read_set, sizeof(fd_set));
  +    memcpy(aprset->write, aprset->write_set, sizeof(fd_set));
  +    memcpy(aprset->except, aprset->except_set, sizeof(fd_set));
  +
       rv = select(aprset->highsock + 1, aprset->read, aprset->write, 
                   aprset->except, tvptr);
       
  @@ -306,7 +316,7 @@
       apr_int16_t revents = 0;
       char data[1];
       int flags = MSG_PEEK;
  -
  +  
       /* We just want to PEEK at the data, so I am setting up a dummy WSABUF
        * variable here.
        */
  @@ -350,22 +360,22 @@
   
   apr_status_t apr_poll_socket_remove(apr_pollfd_t *aprset, apr_socket_t *sock)
   {
  -    FD_CLR(sock->socketdes, aprset->read);
  -    FD_CLR(sock->socketdes, aprset->except);
  -    FD_CLR(sock->socketdes, aprset->write);
  +    FD_CLR(sock->socketdes, aprset->read_set);
  +    FD_CLR(sock->socketdes, aprset->except_set);
  +    FD_CLR(sock->socketdes, aprset->write_set);
       return APR_SUCCESS;
   }
   
   apr_status_t apr_poll_socket_clear(apr_pollfd_t *aprset, apr_int16_t event)
   {
       if (event & APR_POLLIN) {
  -        FD_ZERO(aprset->read);
  +        FD_ZERO(aprset->read_set);
       }
       if (event & APR_POLLPRI) {
  -        FD_ZERO(aprset->except);
  +        FD_ZERO(aprset->except_set);
       }
       if (event & APR_POLLOUT) {
  -        FD_ZERO(aprset->write);
  +        FD_ZERO(aprset->write_set);
       }
       aprset->highsock = 0;
       return APR_SUCCESS;
  
  
  
  1.27      +22 -12    apr/network_io/beos/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/beos/poll.c,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- poll.c	2001/02/16 04:16:00	1.26
  +++ poll.c	2001/03/22 21:50:10	1.27
  @@ -77,9 +77,15 @@
       (*new)->read = (fd_set *)apr_pcalloc(cont, sizeof(fd_set));
       (*new)->write = (fd_set *)apr_pcalloc(cont, sizeof(fd_set));
       (*new)->except = (fd_set *)apr_pcalloc(cont, sizeof(fd_set));
  +    (*new)->read_set = (fd_set *)apr_pcalloc(cont, sizeof(fd_set));
  +    (*new)->write_set = (fd_set *)apr_pcalloc(cont, sizeof(fd_set));
  +    (*new)->except_set = (fd_set *)apr_pcalloc(cont, sizeof(fd_set));
       FD_ZERO((*new)->read);
       FD_ZERO((*new)->write);
       FD_ZERO((*new)->except);
  +    FD_ZERO((*new)->read_set);
  +    FD_ZERO((*new)->write_set);
  +    FD_ZERO((*new)->except_set);
       (*new)->highsock = -1;
       return APR_SUCCESS;
   }
  @@ -88,13 +94,13 @@
                                  apr_socket_t *sock, apr_int16_t event)
   {
       if (event & APR_POLLIN) {
  -        FD_SET(sock->socketdes, aprset->read);
  +        FD_SET(sock->socketdes, aprset->read_set);
       }
       if (event & APR_POLLPRI) {
  -        FD_SET(sock->socketdes, aprset->read);
  +        FD_SET(sock->socketdes, aprset->read_set);
       }
       if (event & APR_POLLOUT) {
  -        FD_SET(sock->socketdes, aprset->write);
  +        FD_SET(sock->socketdes, aprset->write_set);
       }
       if (sock->socketdes > aprset->highsock) {
           aprset->highsock = sock->socketdes;
  @@ -107,13 +113,13 @@
                                     apr_int16_t events)
   {
       if (events & APR_POLLIN) {
  -        FD_CLR(sock->socketdes, aprset->read);
  +        FD_CLR(sock->socketdes, aprset->read_set);
       }
       if (events & APR_POLLPRI) {
  -        FD_CLR(sock->socketdes, aprset->except);
  +        FD_CLR(sock->socketdes, aprset->except_set);
       }
       if (events & APR_POLLOUT) {
  -        FD_CLR(sock->socketdes, aprset->write);
  +        FD_CLR(sock->socketdes, aprset->write_set);
       }
       return APR_SUCCESS;
   }
  @@ -133,6 +139,10 @@
           tvptr = &tv;
       }
   
  +    memcpy(aprset->read, aprset->read_set, sizeof(fd_set));
  +    memcpy(aprset->write, aprset->write_set, sizeof(fd_set));
  +    memcpy(aprset->except, aprset->except_set, sizeof(fd_set));
  +
       rv = select(aprset->highsock + 1, aprset->read, aprset->write, 
                   aprset->except, tvptr);
       
  @@ -192,22 +202,22 @@
   
   apr_status_t apr_poll_socket_remove(apr_pollfd_t *aprset, apr_socket_t *sock)
   {
  -    FD_CLR(sock->socketdes, aprset->read);
  -    FD_CLR(sock->socketdes, aprset->read);
  -    FD_CLR(sock->socketdes, aprset->write);
  +    FD_CLR(sock->socketdes, aprset->read_set);
  +    FD_CLR(sock->socketdes, aprset->except_set);
  +    FD_CLR(sock->socketdes, aprset->write_set);
       return APR_SUCCESS;
   }
   
   apr_status_t apr_poll_socket_clear(apr_pollfd_t *aprset, apr_int16_t event)
   {
       if (event & APR_POLLIN) {
  -        FD_ZERO(aprset->read);
  +        FD_ZERO(aprset->read_set);
       }
       if (event & APR_POLLPRI) {
  -        FD_ZERO(aprset->read);
  +        FD_ZERO(aprset->except_set);
       }
       if (event & APR_POLLOUT) {
  -        FD_ZERO(aprset->write);
  +        FD_ZERO(aprset->write_set);
       }
       aprset->highsock = 0;
       return APR_SUCCESS;
  
  
  
  1.43      +4 -0      apr/test/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr/test/Makefile.in,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- Makefile.in	2001/03/15 18:27:47	1.42
  +++ Makefile.in	2001/03/22 21:50:11	1.43
  @@ -19,6 +19,7 @@
   	testuuid@EXEEXT@ \
           testsockopt@EXEEXT@ \
           testipsub@EXEEXT@ \
  +        testpoll@EXEEXT@ \
   	occhild@EXEEXT@ \
   	mod_test.so
   
  @@ -100,5 +101,8 @@
   
   testipsub@EXEEXT@: testipsub.lo ../libapr.la
   	$(LINK) testipsub.lo $(ALL_LIBS)
  +
  +testpoll@EXEEXT@: testpoll.lo ../libapr.la
  +	$(LINK) testpoll.lo $(ALL_LIBS)
   
   # DO NOT REMOVE
  
  
  
  1.1                  apr/test/testpoll.c
  
  Index: testpoll.c
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  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. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" 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 name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``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 SOFTWARE FOUNDATION 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 Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  #include "apr_mmap.h"
  #include "apr_errno.h"
  #include "apr_general.h"
  #include "apr_lib.h"
  #include "apr_network_io.h"
  #if APR_HAVE_UNISTD_H
  #include <unistd.h>
  #endif
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
  
  static void closeapr(void)
  {
      apr_terminate();
  }
  
  static int make_socket(apr_socket_t **sock, apr_sockaddr_t **sa, apr_port_t port,
                  apr_pool_t *p)
  {
      if (apr_sockaddr_info_get(sa, "127.0.0.1", APR_UNSPEC, port, 0, p)
          != APR_SUCCESS){
          printf("couldn't create control socket information, shutting down");
          return 1;
      }
      if (apr_socket_create(sock, (*sa)->sa.sin.sin_family, SOCK_DGRAM, p)
          != APR_SUCCESS){
          printf("couldn't create UDP socket, shutting down");
          return 1;
      }
      if (apr_bind((*sock), (*sa)) != APR_SUCCESS){
          printf("couldn't bind UDP socket!");
          return 1;
      }
      return 0;
  }
  
  static int check_sockets(apr_pollfd_t *pollset, apr_socket_t **sockarray)
  {
      int i = 0;
      printf("\tSocket 0\tSocket 1\tSocket 2\n\t");
      for (i = 0;i < 3;i++){
          apr_int16_t event;
          if (apr_poll_revents_get(&event, sockarray[i], pollset) != APR_SUCCESS){
              printf("Failed!\n");
              exit (-1);
          }
          if (event & APR_POLLIN){
              printf ("POLLIN!\t\t");
          } else {
              printf ("No wait\t\t");
          }
      }
      printf("\n");
      return 0;
  }
  
  static void send_msg(apr_socket_t **sockarray, apr_sockaddr_t **sas, int which)
  {
      apr_size_t len = 5;
      apr_status_t rv;
      printf("\tSending message to socket %d............", which);
      if ((rv = apr_sendto(sockarray[which], sas[which], 0, "hello", &len)) != APR_SUCCESS){
          printf("Failed! %s\n", strerror(rv));
          exit(-1);
      }
      printf("OK\n");
  }
  
  static void recv_msg(apr_socket_t **sockarray, int which, apr_pool_t *p)
  {
      apr_size_t buflen = 5;
      char *buffer = apr_pcalloc(p, sizeof(char) * buflen);
      apr_sockaddr_t *recsa;
      apr_status_t rv;
  
      apr_sockaddr_info_get(&recsa, "127.0.0.1", APR_UNSPEC, 7770, 0, p);
  
      printf("\tTrying to get message from socket %d....", which);
      if ((rv = apr_recvfrom(recsa, sockarray[which], 0, buffer, &buflen))
          != APR_SUCCESS){
          printf("Failed! %s\n", strerror(rv));
          exit (-1);
      }
      printf("OK\n");
  }
  
  int main(void)
  {
      apr_pool_t *context;
      apr_socket_t *s[3];
      apr_sockaddr_t *sa[3];
      apr_pollfd_t *pollset;
      int i = 0, srv = 0;
      
      fprintf (stdout,"APR Poll Test\n*************\n\n");
      
      printf("Initializing...................................");
      if (apr_initialize() != APR_SUCCESS) {
          printf("Failed.\n");
          exit(-1);
      }
      printf("OK\n");
      atexit(closeapr);
  
      printf("Creating context...............................");    
      if (apr_pool_create(&context, NULL) != APR_SUCCESS) {
          printf("Failed.\n");
          exit(-1);
      }
      printf("OK\n");
      
      printf("\tCreating the sockets I'll use..........");
      for (i = 0; i < 3; i++){
          if (make_socket(&s[i], &sa[i], 7770 + i, context) != 0){
              exit(-1);
          }
      }
      printf("OK\n");
         
      printf ("\tSetting up the pollset I'll use........");
      if (apr_poll_setup(&pollset, 3, context) != APR_SUCCESS){
          printf("Couldn't create a pollset!\n");
          exit (-1);
      }
      for (i = 0; i < 3;i++){
          if (apr_poll_socket_add(pollset, s[i], APR_POLLIN) != APR_SUCCESS){
              printf("Failed to add socket %d\n", i);
              exit (-1);
          }
      }
      printf("OK\n");
      printf("Starting Tests\n");
  
      apr_poll(pollset, &srv, 10);
      check_sockets(pollset, s);
      
      send_msg(s, sa, 2);
  
      apr_poll(pollset, &srv, 10); 
      check_sockets(pollset, s);
  
      recv_msg(s, 2, context);
      send_msg(s, sa, 1);
  
      apr_poll(pollset, &srv, 10); 
      check_sockets(pollset, s);
  
      send_msg(s, sa, 2);
  
      apr_poll(pollset, &srv, 10); 
      check_sockets(pollset, s);
       
      recv_msg(s, 1, context);
      send_msg(s, sa, 0);
      
      apr_poll(pollset, &srv, 10); 
      check_sockets(pollset, s);
          
      printf("Tests completed.\n");
      printf("\tClosing sockets........................");
      for (i = 0; i < 3; i++){
          if (apr_socket_close(s[i]) != APR_SUCCESS){
              printf("Failed!\n");
              exit(-1);
          }
      }
      printf ("OK\n");
      return 1;
  }
  
  
  

Mime
View raw message