svn commit: samba r5306 - in branches/SAMBA_4_0/source: include lib smbd

[tridge at samba.org]

Author: tridge
Date: 2005-02-10 07:18:00 +0000 (Thu, 10 Feb 2005)
New Revision: 5306

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5306

Log:
removed all the unused mutex functions from mutex.c. When (if?) we
decide to reinstate the mutex code for the threads process model, I'd
like to do it a little differently. At least this gets it out of
includes.h for now.


Modified:
   branches/SAMBA_4_0/source/include/includes.h
   branches/SAMBA_4_0/source/include/mutex.h
   branches/SAMBA_4_0/source/include/structs.h
   branches/SAMBA_4_0/source/lib/mutex.c
   branches/SAMBA_4_0/source/smbd/process_thread.c


Changeset:
Modified: branches/SAMBA_4_0/source/include/includes.h
===================================================================
--- branches/SAMBA_4_0/source/include/includes.h	2005-02-10 07:08:40 UTC (rev 5305)
+++ branches/SAMBA_4_0/source/include/includes.h	2005-02-10 07:18:00 UTC (rev 5306)
@@ -124,7 +124,6 @@
 #include "smb.h"
 #include "byteorder.h"
 #include "module.h"
-#include "mutex.h"
 #include "librpc/ndr/libndr.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_dcerpc.h"

Modified: branches/SAMBA_4_0/source/include/mutex.h
===================================================================
--- branches/SAMBA_4_0/source/include/mutex.h	2005-02-10 07:08:40 UTC (rev 5305)
+++ branches/SAMBA_4_0/source/include/mutex.h	2005-02-10 07:18:00 UTC (rev 5306)
@@ -21,16 +21,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-/* To add a new mutex, add it to enum mutex_id
- */
-enum mutex_id { MUTEX_SMBD, 		/* global smbd lock */
-		MUTEX_TALLOC, 		/* global talloc.c lock */
-		MUTEX_DEBUG,		/* global debug.c lock */
-		MUTEX_TANK,		/* vfs_tank lock */
-
-		MUTEX_MAX /* this MUST be kept last */
-};
-
 /* To add a new read/write lock, add it to enum rwlock_id
  */
 enum rwlock_id { RWLOCK_SMBD, 		/* global smbd lock */
@@ -55,7 +45,7 @@
 
 /* this null typedef ensures we get the types right and avoids the
    pitfalls of void* */
-typedef struct {
+typedef struct smb_mutex {
 	void *mutex;
 } smb_mutex_t;
 typedef struct {

Modified: branches/SAMBA_4_0/source/include/structs.h
===================================================================
--- branches/SAMBA_4_0/source/include/structs.h	2005-02-10 07:08:40 UTC (rev 5305)
+++ branches/SAMBA_4_0/source/include/structs.h	2005-02-10 07:18:00 UTC (rev 5306)
@@ -172,3 +172,5 @@
 
 struct nbtd_server;
 struct nbtd_interface;
+
+struct mutex_ops;

Modified: branches/SAMBA_4_0/source/lib/mutex.c
===================================================================
--- branches/SAMBA_4_0/source/lib/mutex.c	2005-02-10 07:08:40 UTC (rev 5305)
+++ branches/SAMBA_4_0/source/lib/mutex.c	2005-02-10 07:18:00 UTC (rev 5306)
@@ -19,100 +19,17 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 #include "includes.h"
+#include "mutex.h"
 	 
-static smb_mutex_t mutex_list[MUTEX_MAX];
-
 /* the registered mutex handlers */
 static struct {
 	const char *name;
 	struct mutex_ops ops;
 } mutex_handlers;
 
-int smb_mutex_lock_by_id(enum mutex_id id, const char *name)
-{
-	return smb_mutex_lock(&mutex_list[id], name);
-}
-
-int smb_mutex_unlock_by_id(enum mutex_id id, const char *name)
-{
-	return smb_mutex_unlock(&mutex_list[id], name);
-}
-
-int smb_mutex_init(smb_mutex_t *mutex, const char *name)
-{
-	if (mutex_handlers.ops.mutex_init) {
-		return mutex_handlers.ops.mutex_init(mutex, name);
-	}
-	return 0;
-}
-
-int smb_mutex_destroy(smb_mutex_t *mutex, const char *name)
-{
-	if (mutex_handlers.ops.mutex_destroy) {
-		return mutex_handlers.ops.mutex_destroy(mutex, name);
-	}
-	return 0;
-}
-
-int smb_mutex_lock(smb_mutex_t *mutex, const char *name)
-{
-	if (mutex_handlers.ops.mutex_lock) {
-		return mutex_handlers.ops.mutex_lock(mutex, name);
-	}
-	return 0;
-}
-
-int smb_mutex_unlock(smb_mutex_t *mutex, const char *name)
-{
-	if (mutex_handlers.ops.mutex_unlock) {
-		return mutex_handlers.ops.mutex_unlock(mutex, name);
-	}
-	return 0;
-}
-
 /* read/write lock routines */
 
-int smb_rwlock_init(smb_rwlock_t *rwlock, const char *name)
-{
-	if (mutex_handlers.ops.rwlock_init) {
-		return mutex_handlers.ops.rwlock_init(rwlock, name);
-	}
-	return 0;
-}
 
-int smb_rwlock_destroy(smb_rwlock_t *rwlock, const char *name)
-{
-	if (mutex_handlers.ops.rwlock_destroy) {
-		return mutex_handlers.ops.rwlock_destroy(rwlock, name);
-	}
-	return 0;
-}
-
-int smb_rwlock_lock_write(smb_rwlock_t *rwlock, const char *name)
-{
-	if (mutex_handlers.ops.rwlock_lock_write) {
-		return mutex_handlers.ops.rwlock_lock_write(rwlock, name);
-	}
-	return 0;
-}
-
-int smb_rwlock_lock_read(smb_rwlock_t *rwlock, const char *name)
-{
-	if (mutex_handlers.ops.rwlock_lock_read) {
-		return mutex_handlers.ops.rwlock_lock_read(rwlock, name);
-	}
-	return 0;
-}
-
-int smb_rwlock_unlock(smb_rwlock_t *rwlock, const char *name)
-{
-	if (mutex_handlers.ops.rwlock_unlock) {
-		return mutex_handlers.ops.rwlock_unlock(rwlock, name);
-	}
-	return 0;
-}
-
-
 /*
   register a set of mutex/rwlock handlers. 
   Should only be called once in the execution of smbd.
@@ -129,13 +46,6 @@
 	mutex_handlers.name = name;
 	mutex_handlers.ops = *ops;
 
-	if (mutex_handlers.ops.mutex_init) {
-		enum mutex_id id;
-		for (id=0; id < MUTEX_MAX; id++) {
-			mutex_handlers.ops.mutex_init(&mutex_list[id], "mutex_list");
-		}
-	}
-
 	DEBUG(2,("mutex handler '%s' registered\n", name));
 	return True;
 }

Modified: branches/SAMBA_4_0/source/smbd/process_thread.c
===================================================================
--- branches/SAMBA_4_0/source/smbd/process_thread.c	2005-02-10 07:08:40 UTC (rev 5305)
+++ branches/SAMBA_4_0/source/smbd/process_thread.c	2005-02-10 07:18:00 UTC (rev 5306)
@@ -33,6 +33,7 @@
 #include "lib/events/events.h"
 #include "dlinklist.h"
 #include "smb_server/smb_server.h"
+#include "mutex.h"
 
 struct new_conn_state {
 	struct event_context *ev;