You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by ia...@apache.org on 2002/08/18 22:41:08 UTC
cvs commit: apr-util/test .cvsignore Makefile.in testqueue.c
ianh 2002/08/18 13:41:08
Modified: misc Makefile.in apr_queue.c
test .cvsignore Makefile.in testqueue.c
Log:
add unix-type things and make it not spit out debug messages
Revision Changes Path
1.10 +1 -1 apr-util/misc/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/misc/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile.in 5 Aug 2002 03:25:40 -0000 1.9
+++ Makefile.in 18 Aug 2002 20:41:08 -0000 1.10
@@ -2,7 +2,7 @@
INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
-TARGETS = apr_date.lo apr_rmm.lo apr_reslist.lo
+TARGETS = apr_date.lo apr_rmm.lo apr_reslist.lo apr_queue.lo
# bring in rules.mk for standard functionality
@INCLUDE_RULES@
1.2 +1 -1 apr-util/misc/apr_queue.c
Index: apr_queue.c
===================================================================
RCS file: /home/cvs/apr-util/misc/apr_queue.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apr_queue.c 18 Aug 2002 20:22:28 -0000 1.1
+++ apr_queue.c 18 Aug 2002 20:41:08 -0000 1.2
@@ -74,8 +74,8 @@
/*
* define this to get debug messages
*
- */
#define QUEUE_DEBUG
+ */
struct apr_queue_t {
void **data;
1.7 +7 -0 apr-util/test/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr-util/test/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 26 Aug 2001 22:38:30 -0000 1.6
+++ .cvsignore 18 Aug 2002 20:41:08 -0000 1.7
@@ -1,10 +1,17 @@
Makefile
*.lo
*.plg
+*.swp
Debug
*.la
.libs
testdbm
testmd4
+testmd5
+testqueue
+testreslist
+testrmm
+testuuid
+teststrmatch
testdate
testxml
1.31 +8 -1 apr-util/test/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/test/Makefile.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Makefile.in 5 Aug 2002 03:25:40 -0000 1.30
+++ Makefile.in 18 Aug 2002 20:41:08 -0000 1.31
@@ -2,7 +2,8 @@
INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
-PROGRAMS = testdbm testdate testmd4 testmd5 testxml testrmm teststrmatch testuuid testreslist
+PROGRAMS = testdbm testdate testmd4 testmd5 testxml testrmm teststrmatch \
+ testuuid testreslist testqueue
TARGETS = $(PROGRAMS)
# bring in rules.mk for standard functionality
@@ -55,4 +56,10 @@
testreslist_LDADD = ../libaprutil.la
testreslist: $(testreslist_OBJECTS) $(testreslist_LDADD)
$(LINK) $(testreslist_OBJECTS) $(testreslist_LDADD) $(PROGRAM_DEPENDENCIES)
+
+testqueue_OBJECTS = testqueue.lo
+testqueue_LDADD = ../libaprutil.la
+testqueue: $(testqueue_OBJECTS) $(testqueue_LDADD)
+ $(LINK) $(testqueue_OBJECTS) $(testqueue_LDADD) $(PROGRAM_DEPENDENCIES)
+
1.2 +7 -4 apr-util/test/testqueue.c
Index: testqueue.c
===================================================================
RCS file: /home/cvs/apr-util/test/testqueue.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- testqueue.c 18 Aug 2002 20:22:29 -0000 1.1
+++ testqueue.c 18 Aug 2002 20:41:08 -0000 1.2
@@ -77,11 +77,14 @@
#else /* !APR_HAS_THREADS */
apr_pool_t *context;
-int consumer_activity=300;
-int producer_activity=200;
+int consumer_activity=400;
+int producer_activity=300;
int verbose=0;
+static void * APR_THREAD_FUNC consumer(apr_thread_t *thd, void *data);
+static void * APR_THREAD_FUNC producer(apr_thread_t *thd, void *data);
+static void usage();
-void * APR_THREAD_FUNC consumer(apr_thread_t *thd, void *data)
+static void * APR_THREAD_FUNC consumer(apr_thread_t *thd, void *data)
{
long sleeprate;
apr_queue_t *q = (apr_queue_t*)data;
@@ -117,7 +120,7 @@
return NULL;
}
-void * APR_THREAD_FUNC producer(apr_thread_t *thd, void *data)
+static void * APR_THREAD_FUNC producer(apr_thread_t *thd, void *data)
{
int i=0;
long sleeprate;