revise the definition of multiple basic locks in the code

In all cases this is just a change from two volatile int to one.
This commit is contained in:
Jens Gustedt 2018-01-03 14:17:12 +01:00 committed by Rich Felker
parent c4bc0b1a64
commit 32482f61da
15 changed files with 16 additions and 16 deletions

View File

@ -4,6 +4,6 @@ struct __dirstream
off_t tell;
int buf_pos;
int buf_end;
volatile int lock[2];
volatile int lock[1];
char buf[2048];
};

View File

@ -5,7 +5,7 @@
static void (*funcs[COUNT])(void);
static int count;
static volatile int lock[2];
static volatile int lock[1];
void __funcs_on_quick_exit()
{

View File

@ -13,7 +13,7 @@ static struct fl
} builtin, *head;
static int slot;
static volatile int lock[2];
static volatile int lock[1];
void __funcs_on_exit()
{

View File

@ -39,8 +39,8 @@ struct pthread {
int unblock_cancel;
volatile int timer_id;
locale_t locale;
volatile int killlock[2];
volatile int exitlock[2];
volatile int killlock[1];
volatile int exitlock[1];
volatile int startlock[2];
unsigned long sigmask[_NSIG/8/sizeof(long)];
char *dlerror_buf;

View File

@ -34,7 +34,7 @@ static char *gettextdir(const char *domainname, size_t *dirlen)
char *bindtextdomain(const char *domainname, const char *dirname)
{
static volatile int lock[2];
static volatile int lock[1];
struct binding *p, *q;
if (!domainname) return 0;

View File

@ -26,7 +26,7 @@ static const char envvars[][12] = {
const struct __locale_map *__get_locale(int cat, const char *val)
{
static volatile int lock[2];
static volatile int lock[1];
static void *volatile loc_head;
const struct __locale_map *p;
struct __locale_map *new = 0;

View File

@ -21,7 +21,7 @@ char *__strchrnul(const char *, int);
char *setlocale(int cat, const char *name)
{
static volatile int lock[2];
static volatile int lock[1];
if ((unsigned)cat > LC_ALL) return 0;

View File

@ -11,7 +11,7 @@ void *__expand_heap(size_t *);
static void *__simple_malloc(size_t n)
{
static char *cur, *end;
static volatile int lock[2];
static volatile int lock[1];
size_t align=1, pad;
void *p;

View File

@ -11,7 +11,7 @@
#include <fcntl.h>
#include "libc.h"
static volatile int lock[2];
static volatile int lock[1];
static char log_ident[32];
static int log_opt;
static int log_facility = LOG_USER;

View File

@ -22,7 +22,7 @@ static int n = 31;
static int i = 3;
static int j = 0;
static uint32_t *x = init+1;
static volatile int lock[2];
static volatile int lock[1];
static uint32_t lcg31(uint32_t x) {
return (1103515245*x + 12345) & 0x7fffffff;

View File

@ -2,7 +2,7 @@
#include "libc.h"
static FILE *ofl_head;
static volatile int ofl_lock[2];
static volatile int ofl_lock[1];
FILE **__ofl_lock()
{

View File

@ -8,7 +8,7 @@ static struct atfork_funcs {
struct atfork_funcs *prev, *next;
} *funcs;
static volatile int lock[2];
static volatile int lock[1];
void __fork_handler(int who)
{

View File

@ -20,7 +20,7 @@ static struct {
sem_t *sem;
int refcnt;
} *semtab;
static volatile int lock[2];
static volatile int lock[1];
#define FLAGS (O_RDWR|O_NOFOLLOW|O_CLOEXEC|O_NONBLOCK)

View File

@ -14,7 +14,7 @@ static struct chain {
sem_t target_sem, caller_sem;
} *volatile head;
static volatile int synccall_lock[2];
static volatile int synccall_lock[1];
static volatile int target_tid;
static void (*callback)(void *), *context;
static volatile int dummy = 0;

View File

@ -27,7 +27,7 @@ static char old_tz_buf[32];
static char *old_tz = old_tz_buf;
static size_t old_tz_size = sizeof old_tz_buf;
static volatile int lock[2];
static volatile int lock[1];
static int getint(const char **p)
{