Attachment #9366 for bug #20263

View | Details | Raw Unified | Return to bug 20263
Collapse All | Expand All

Lines 1-3 Link Here

(-)a/ChangeLog (+5 lines)
		1	2016-06-24 Jiyoung Yun <t2wish@gmail.com>
		2
		3	[BZ #20263]
		4	* nptl/lowlevelrobustlock.c: Implement ETIMEDOUT logic.
		5
1	2016-06-23 Florian Weimer <fweimer@redhat.com>	6	2016-06-23 Florian Weimer <fweimer@redhat.com>
2		7
3	* test-skeleton.c (xrealloc): Support deallocation with n == 0.	8	* test-skeleton.c (xrealloc): Support deallocation with n == 0.




	  && atomic_compare_and_exchange_bool_acq (futex, newval, oldval))
	continue;

      int err;
      /* If *futex == 2, wait until woken or timeout.  */
#if (!defined __ASSUME_FUTEX_CLOCK_REALTIME \
     || !defined lll_futex_timed_wait_bitset)
      err = lll_futex_timed_wait (futex, newval, &rt, private);
#else
      err = lll_futex_timed_wait_bitset (futex, newval, abstime,
				   FUTEX_CLOCK_REALTIME, private);
#endif

      /* the futex call time out */
      if (err == -ETIMEDOUT)
         return ETIMEDOUT;

    try:
      ;
    }
- 

Return to bug 20263

Lines 113-127 __lll_robust_timedlock_wait (int futex, const struct timespec abstime, Link Here

(-)a/nptl/lowlevelrobustlock.c (-3 / +7 lines)
113	&& atomic_compare_and_exchange_bool_acq (futex, newval, oldval))	113	&& atomic_compare_and_exchange_bool_acq (futex, newval, oldval))
114	continue;	114	continue;
115		115
		116	int err;
116	/* If futex == 2, wait until woken or timeout. /	117	/* If futex == 2, wait until woken or timeout. /
117	#if (!defined __ASSUME_FUTEX_CLOCK_REALTIME \	118	#if (!defined __ASSUME_FUTEX_CLOCK_REALTIME \
118	\|\| !defined lll_futex_timed_wait_bitset)	119	\|\| !defined lll_futex_timed_wait_bitset)
119	lll_futex_timed_wait (futex, newval, &rt, private);	120	err = lll_futex_timed_wait (futex, newval, &rt, private);
120	#else	121	#else
121	lll_futex_timed_wait_bitset (futex, newval, abstime,	122	err = lll_futex_timed_wait_bitset (futex, newval, abstime,
122	FUTEX_CLOCK_REALTIME, private);	123	FUTEX_CLOCK_REALTIME, private);
123	#endif	124	#endif
124		125
		126	/* the futex call time out */
		127	if (err == -ETIMEDOUT)
		128	return ETIMEDOUT;
		129
125	try:	130	try:
126	;	131	;
127	}	132	}
128	-