qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use unsigned types for counters in AIO code.

This commit is contained in:
Roland McGrath 2015-06-24 17:43:32 -07:00
parent a7fcc2f8ed
commit 86edd44f04
5 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2015-06-24 Roland McGrath <roland@hack.frob.com>
* sysdeps/pthread/aio_misc.h (struct waitlist): Change type of field
counterp to 'volatile unsigned int *'.
* sysdeps/pthread/aio_suspend.c [DONT_NEED_AIO_MISC_COND]
(do_aio_misc_wait): Give argument CNTR type 'unsigned int *'.
(aio_suspend): Give local variable CNTR type 'unsigned int'.
* sysdeps/pthread/lio_listio.c (lio_listio_internal):
Give local variable TOTAL type 'volatile unsigned int'.
(struct async_waitlist): Change type of field counter to 'unsigned int'.
2015-06-24 H.J. Lu <hongjiu.lu@intel.com> 2015-06-24 H.J. Lu <hongjiu.lu@intel.com>
[BZ #18383] [BZ #18383]

4
sysdeps/nptl/aio_misc.h
View File

@ -34,8 +34,8 @@
#define AIO_MISC_WAIT(result, futex, timeout, cancel) \ #define AIO_MISC_WAIT(result, futex, timeout, cancel) \
do { \ do { \
volatile int *futexaddr = &futex; \ volatile unsigned int *futexaddr = &futex; \
int oldval = futex; \ unsigned int oldval = futex; \
\ \
if (oldval != 0) \ if (oldval != 0) \
{ \ { \

2
sysdeps/pthread/aio_misc.h
View File

@ -51,7 +51,7 @@ struct waitlist
#endif #endif
int *result; int *result;
volatile int *counterp; volatile unsigned int *counterp;
/* The next field is used in asynchronous `lio_listio' operations. */ /* The next field is used in asynchronous `lio_listio' operations. */
struct sigevent *sigevp; struct sigevent *sigevp;
#ifdef BROKEN_THREAD_SIGNALS #ifdef BROKEN_THREAD_SIGNALS

12
sysdeps/pthread/aio_suspend.c
View File

@ -94,13 +94,13 @@ cleanup (void *arg)
#ifdef DONT_NEED_AIO_MISC_COND #ifdef DONT_NEED_AIO_MISC_COND
static int static int
__attribute__ ((noinline)) __attribute__ ((noinline))
do_aio_misc_wait(int *cntr, const struct timespec *timeout) do_aio_misc_wait (unsigned int *cntr, const struct timespec *timeout)
{ {
int result = 0; int result = 0;
AIO_MISC_WAIT(result, *cntr, timeout, 1); AIO_MISC_WAIT (result, *cntr, timeout, 1);
return result; return result;
} }
#endif #endif
@ -124,7 +124,7 @@ aio_suspend (list, nent, timeout)
int cnt; int cnt;
bool any = false; bool any = false;
int result = 0; int result = 0;
int cntr = 1; unsigned int cntr = 1;
/* Request the mutex. */ /* Request the mutex. */
pthread_mutex_lock (&__aio_requests_mutex); pthread_mutex_lock (&__aio_requests_mutex);
@ -180,7 +180,7 @@ aio_suspend (list, nent, timeout)
pthread_cleanup_push (cleanup, &clparam); pthread_cleanup_push (cleanup, &clparam);
#ifdef DONT_NEED_AIO_MISC_COND #ifdef DONT_NEED_AIO_MISC_COND
result = do_aio_misc_wait(&cntr, timeout); result = do_aio_misc_wait (&cntr, timeout);
#else #else
if (timeout == NULL) if (timeout == NULL)
result = pthread_cond_wait (&cond, &__aio_requests_mutex); result = pthread_cond_wait (&cond, &__aio_requests_mutex);

6
sysdeps/pthread/lio_listio.c
View File

@ -35,7 +35,7 @@
/* We need this special structure to handle asynchronous I/O. */ /* We need this special structure to handle asynchronous I/O. */
struct async_waitlist struct async_waitlist
{ {
int counter; unsigned int counter;
struct sigevent sigev; struct sigevent sigev;
struct waitlist list[0]; struct waitlist list[0];
}; };
@ -61,7 +61,7 @@ lio_listio_internal (int mode, struct aiocb *const list[], int nent,
struct sigevent defsigev; struct sigevent defsigev;
struct requestlist *requests[nent]; struct requestlist *requests[nent];
int cnt; int cnt;
volatile int total = 0; volatile unsigned int total = 0;
int result = 0; int result = 0;
if (sig == NULL) if (sig == NULL)
@ -83,7 +83,7 @@ lio_listio_internal (int mode, struct aiocb *const list[], int nent,
requests[cnt] = __aio_enqueue_request ((aiocb_union *) list[cnt], requests[cnt] = __aio_enqueue_request ((aiocb_union *) list[cnt],
(list[cnt]->aio_lio_opcode (list[cnt]->aio_lio_opcode
| LIO_OPCODE_BASE)); | LIO_OPCODE_BASE));
if (requests[cnt] != NULL) if (requests[cnt] != NULL)
/* Successfully enqueued. */ /* Successfully enqueued. */