Skip to content

Commit

Permalink
Update.
Browse files Browse the repository at this point in the history
2003-11-04  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/pthread/bits/stdio-lock.h: Use lll_*lock instead of
	lll_mutex_*lock macros to skip atomic operations on some archs.
  • Loading branch information
Ulrich Drepper committed Nov 4, 2003
1 parent 9378784 commit c28422b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
5 changes: 5 additions & 0 deletions nptl/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2003-11-04 Ulrich Drepper <drepper@redhat.com>

* sysdeps/pthread/bits/stdio-lock.h: Use lll_*lock instead of
lll_mutex_*lock macros to skip atomic operations on some archs.

2003-11-03 Ulrich Drepper <drepper@redhat.com>

* sysdeps/pthread/tst-timer.c (main): Initialize
Expand Down
8 changes: 4 additions & 4 deletions nptl/sysdeps/pthread/bits/stdio-lock.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

typedef struct { int lock; int cnt; void *owner; } _IO_lock_t;

#define _IO_lock_initializer { LLL_MUTEX_LOCK_INITIALIZER, 0, NULL }
#define _IO_lock_initializer { LLL_LOCK_INITIALIZER, 0, NULL }

#define _IO_lock_init(_name) \
((_name) = (_IO_lock_t) _IO_lock_initializer , 0)
Expand All @@ -42,7 +42,7 @@ typedef struct { int lock; int cnt; void *owner; } _IO_lock_t;
void *__self = THREAD_SELF; \
if ((_name).owner != __self) \
{ \
lll_mutex_lock ((_name).lock); \
lll_lock ((_name).lock); \
(_name).owner = __self; \
} \
++(_name).cnt; \
Expand All @@ -54,7 +54,7 @@ typedef struct { int lock; int cnt; void *owner; } _IO_lock_t;
void *__self = THREAD_SELF; \
if ((_name).owner != __self) \
{ \
if (lll_mutex_trylock ((_name).lock) == 0) \
if (lll_trylock ((_name).lock) == 0) \
{ \
(_name).owner = __self; \
(_name).cnt = 1; \
Expand All @@ -72,7 +72,7 @@ typedef struct { int lock; int cnt; void *owner; } _IO_lock_t;
if (--(_name).cnt == 0) \
{ \
(_name).owner = NULL; \
lll_mutex_unlock ((_name).lock); \
lll_unlock ((_name).lock); \
} \
} while (0)

Expand Down
2 changes: 1 addition & 1 deletion nptl/sysdeps/pthread/tst-timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ main (void)
sigev2.sigev_notify_attributes = NULL;
/* It is unnecessary to do the following but to set a good example
we do it anyhow. */
sigev2.sigev_value = 0;
sigev2.sigev_value.sival_ptr = NULL;

setvbuf (stdout, 0, _IOLBF, 0);

Expand Down

0 comments on commit c28422b

Please sign in to comment.