sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

Allow a parameter to smb_thread_once's initialization function

Browse Source 
- This should make life easier for ourselves. We're no longer constrained to
  the semantics of pthread_once, so let's allow passing a parameter to the
  initialization function. Some of Samba's init functions return a
  value. Although I haven't searched, I suspect that some of the init
  functions require in input parameters. The parameter added here can be used
  for input, output, or both, as necessary... or ignored, as is now done in
  talloc_stackframe_init().

Derrell
This commit is contained in:
Derrell Lipman 2009-05-13 09:49:59 -04:00
parent 652251701d
commit e03b9ae609
4 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/util/smb_threads.c
View File

@ -105,33 +105,44 @@ int smb_thread_set_functions(const struct smb_thread_functions *tf)
implementation's "once" type.
********************************************************************/
int smb_thread_once(smb_thread_once_t *ponce, void (*init_fn)(void))
int smb_thread_once(smb_thread_once_t *ponce,
void (*init_fn)(void *pdata),
void *pdata)
{
int ret;
/* Lock our "once" mutex in order to test and initialize ponce */
if ((ret = SMB_THREAD_LOCK(once_mutex, SMB_THREAD_LOCK)) != 0) {
if (SMB_THREAD_LOCK(once_mutex, SMB_THREAD_LOCK) != 0) {
smb_panic("error locking 'once'");
}
/* Keep track of whether we ran their init function */
ret = ! *ponce;
/*
* See if another thread got here after we tested it initially but
* before we got our lock.
*/
if (! *ponce) {
/* Nope, we need to run the initialization function */
(*init_fn)();
(*init_fn)(pdata);
/* Now we can indicate that the function has been run */
*ponce = true;
}
/* Unlock the mutex */
if ((ret = SMB_THREAD_LOCK(once_mutex, SMB_THREAD_UNLOCK)) != 0) {
if (SMB_THREAD_LOCK(once_mutex, SMB_THREAD_UNLOCK) != 0) {
smb_panic("error unlocking 'once'");
}
return 0;
/*
* Tell 'em whether we ran their init function. If they passed a data
* pointer to the init function and the init function could change
* something in the pointed-to data, this will tell them whether that
* data is valid or not.
*/
return ret;
}

4
lib/util/smb_threads.h
View File

@ -52,7 +52,9 @@ struct smb_thread_functions {
};
int smb_thread_set_functions(const struct smb_thread_functions *tf);
int smb_thread_once(smb_thread_once_t *ponce, void (*init_fn)(void));
int smb_thread_once(smb_thread_once_t *ponce,
void (*init_fn)(void *pdata),
void *pdata);
extern const struct smb_thread_functions *global_tfp;

12
lib/util/smb_threads_internal.h
View File

@ -33,12 +33,12 @@
#define SMB_THREAD_LOCK(plock, type) \
(global_tfp ? global_tfp->lock_mutex((plock), (type), __location__) : 0)
#define SMB_THREAD_ONCE(ponce, init_fn) \
(global_tfp \
? (! *(ponce) \
? smb_thread_once((ponce), (init_fn)) \
: 0) \
: ((init_fn()), 0))
#define SMB_THREAD_ONCE(ponce, init_fn, pdata) \
(global_tfp \
? (! *(ponce) \
? smb_thread_once((ponce), (init_fn), (pdata)) \
: 0) \
: ((init_fn(pdata)), 0))
#define SMB_THREAD_CREATE_TLS(keyname, key) \
(global_tfp ? global_tfp->create_tls((keyname), &(key), __location__) : 0)

4
lib/util/talloc_stack.c
View File

@ -58,7 +58,7 @@ static void *global_ts;
/* Variable to ensure TLS value is only initialized once. */
static smb_thread_once_t ts_initialized = SMB_THREAD_ONCE_INIT;
static void talloc_stackframe_init(void)
static void talloc_stackframe_init(void * unused)
{
if (!global_tfp) {
/* Non-thread safe init case. */
@ -92,7 +92,7 @@ static struct talloc_stackframe *talloc_stackframe_create(void)
ZERO_STRUCTP(ts);
SMB_THREAD_ONCE(&ts_initialized, talloc_stackframe_init);
SMB_THREAD_ONCE(&ts_initialized, talloc_stackframe_init, NULL);
if (SMB_THREAD_SET_TLS(global_ts, ts)) {
smb_panic("talloc_stackframe_init set_tls failed");