sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

r5306: removed all the unused mutex functions from mutex.c. When (if?) we

Browse Source 
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.
(This used to be commit cfee0fb02e)
This commit is contained in:
Andrew Tridgell 2005-02-10 07:18:00 +00:00 committed by Gerald (Jerry) Carter
parent 501379431c
commit 6aa6dce3f7
5 changed files with 5 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source4/include/includes.h
View File

@ -124,7 +124,6 @@ extern int errno;
#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"

12
source4/include/mutex.h
View File

@ -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 @@ enum rwlock_id { RWLOCK_SMBD, /* global smbd lock */
/* 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 {

2
source4/include/structs.h
View File

@ -172,3 +172,5 @@ struct stream_server_ops;
struct nbtd_server;
struct nbtd_interface;
struct mutex_ops;

92
source4/lib/mutex.c
View File

@ -19,99 +19,16 @@
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.
@ -129,13 +46,6 @@ BOOL register_mutex_handlers(const char *name, struct mutex_ops *ops)
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;
}

1
source4/smbd/process_thread.c
View File

@ -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;