httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ben Hyde <bh...@pobox.com>
Subject Removing ap_dummy_mutex from API
Date Thu, 01 Oct 1998 18:20:44 GMT

This removes the global ap_dummy_mutex used in multithread.h
as so:

  -#define ap_create_mutex(name) ((mutex *)ap_dummy_mutex)
  +#define ap_create_mutex(name) ((mutex *)-1)

It is currently defined in http_main.c 
  -/* this just need to be anything non-NULL */
  -void *ap_dummy_mutex = &ap_dummy_mutex;

It's one of the four things that keeps one from using alloc.c
buff.c, and ap/ standalone.

It does change the API for unix only.  You'll need to loadable modules
which use mutex.  So I bumped the MODULE_MAGIC_NUMBER_MINOR.

Any complaints?

 - ben hyde

---
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1085
diff -u -r1.1085 CHANGES
--- CHANGES	1998/10/01 04:53:22	1.1085
+++ CHANGES	1998/10/01 18:19:48
@@ -1,5 +1,9 @@
 Changes with Apache 1.3.3
 
+  *) Remove the global ap_dummy_mutex from the API.  Increment
+     MODULE_MAGIC_NUMBER_MINOR, unix users will need to recompile
+     dynamicly loaded modules. [Ben Hyde]
+
   *) Win32 name canonicalisation could end up using the server's
      working directory to fill in some blanks.  [Ken Parzygnat
      <kparz@raleigh.ibm.com>] PR#3001
Index: include/ap_compat.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/ap_compat.h,v
retrieving revision 1.14
diff -u -r1.14 ap_compat.h
--- ap_compat.h	1998/07/13 11:32:33	1.14
+++ ap_compat.h	1998/10/01 18:19:48
@@ -112,7 +112,6 @@
 #define die                            ap_die
 #define discard_request_body           ap_discard_request_body
 #define document_root                  ap_document_root
-#define dummy_mutex                    ap_dummy_mutex
 #define each_byterange                 ap_each_byterange
 #define error_log2stderr               ap_error_log2stderr
 #define escape_html                    ap_escape_html
Index: include/ap_mmn.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/ap_mmn.h,v
retrieving revision 1.8
diff -u -r1.8 ap_mmn.h
--- ap_mmn.h	1998/09/17 20:23:41	1.8
+++ ap_mmn.h	1998/10/01 18:19:48
@@ -183,7 +183,7 @@
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
 #define MODULE_MAGIC_NUMBER_MAJOR 19980917
 #endif
-#define MODULE_MAGIC_NUMBER_MINOR 0                     /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 1                     /* 0...n */
 #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR	/* backward compat */
 
 /* Useful for testing for features. */
Index: include/multithread.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/multithread.h,v
retrieving revision 1.11
diff -u -r1.11 multithread.h
--- multithread.h	1998/05/03 17:31:10	1.11
+++ multithread.h	1998/10/01 18:19:48
@@ -49,9 +49,8 @@
 
 #define APACHE_TLS
 /* Only define the ones actually used, for now */
-extern void *ap_dummy_mutex;
 
-#define ap_create_mutex(name)	((mutex *)ap_dummy_mutex)
+#define ap_create_mutex(name)	((mutex *)-1)
 #define ap_acquire_mutex(mutex_id)	((int)MULTI_OK)
 #define ap_release_mutex(mutex_id)	((int)MULTI_OK)
 #define ap_destroy_mutex(mutex_id)	(0)
Index: main/http_main.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.397
diff -u -r1.397 http_main.c
--- http_main.c	1998/09/21 10:16:11	1.397
+++ http_main.c	1998/10/01 18:19:49
@@ -215,10 +215,6 @@
 #define MONCONTROL(x)
 #endif
 
-#ifndef MULTITHREAD
-/* this just need to be anything non-NULL */
-void *ap_dummy_mutex = &ap_dummy_mutex;
-#endif
 
 /*
  * Actual definitions of config globals... here because this is
Index: support/httpd.exp
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/support/httpd.exp,v
retrieving revision 1.5
diff -u -r1.5 httpd.exp
--- httpd.exp	1998/09/01 20:21:14	1.5
+++ httpd.exp	1998/10/01 18:19:52
@@ -87,7 +87,6 @@
 ap_die
 ap_discard_request_body
 ap_document_root
-ap_dummy_mutex
 ap_each_byterange
 ap_error_log2stderr
 ap_escape_html
Index: test/rename/compat.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/test/rename/compat.h,v
retrieving revision 1.2
diff -u -r1.2 compat.h
--- compat.h	1998/04/11 10:20:37	1.2
+++ compat.h	1998/10/01 18:19:52
@@ -104,7 +104,6 @@
 #define die                            ap_die
 #define discard_request_body           ap_discard_request_body
 #define document_root                  ap_document_root
-#define dummy_mutex                    ap_dummy_mutex
 #define each_byterange                 ap_each_byterange
 #define error_log2stderr               ap_error_log2stderr
 #define escape_html                    ap_escape_html

Mime
View raw message