d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove #include of spinlock.h from libc_private.h. Declare spinlocks as

Browse Source 
struct _spinlock.  Keep the typedef in for now; another set of changes
may come around to clean up consumers of spinlocks.

Requested by:	bde
This commit is contained in:
Daniel Eischen 2003-11-05 18:17:30 +00:00
parent 4e2a2c6a2d
commit 82358b1b5a
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libc/include/libc_private.h
View File

@ -38,8 +38,6 @@
#ifndef _LIBC_PRIVATE_H_ #ifndef _LIBC_PRIVATE_H_
#define _LIBC_PRIVATE_H_ #define _LIBC_PRIVATE_H_
#include <spinlock.h>
/* /*
* This global flag is non-zero when a process has created one * This global flag is non-zero when a process has created one
* or more threads. It is used to avoid calling locking functions * or more threads. It is used to avoid calling locking functions
@ -126,6 +124,6 @@ extern const char *__progname;
* This is the lock to make malloc() thread-safe. It is externalized * This is the lock to make malloc() thread-safe. It is externalized
* so that thread libraries can protect malloc across fork(). * so that thread libraries can protect malloc across fork().
*/ */
extern spinlock_t *__malloc_lock; extern struct _spinlock *__malloc_lock;
#endif /* _LIBC_PRIVATE_H_ */ #endif /* _LIBC_PRIVATE_H_ */

5
lib/libc/include/spinlock.h
View File

@ -43,12 +43,13 @@
/* /*
* Lock structure with room for debugging information. * Lock structure with room for debugging information.
*/ */
typedef struct { struct _spinlock {
volatile long access_lock; volatile long access_lock;
volatile long lock_owner; volatile long lock_owner;
volatile char *fname; volatile char *fname;
volatile int lineno; volatile int lineno;
} spinlock_t; };
typedef struct _spinlock spinlock_t;
#define _SPINLOCK_INITIALIZER { 0, 0, 0, 0 } #define _SPINLOCK_INITIALIZER { 0, 0, 0, 0 }