summaryrefslogtreecommitdiff
path: root/nptl_db/td_thr_clear_event.c
diff options
context:
space:
mode:
Diffstat (limited to 'nptl_db/td_thr_clear_event.c')
-rw-r--r--nptl_db/td_thr_clear_event.c67
1 files changed, 45 insertions, 22 deletions
diff --git a/nptl_db/td_thr_clear_event.c b/nptl_db/td_thr_clear_event.c
index e729b52706..fc999df9c2 100644
--- a/nptl_db/td_thr_clear_event.c
+++ b/nptl_db/td_thr_clear_event.c
@@ -1,5 +1,5 @@
/* Disable specific event for thread.
- Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999,2001,2002,2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 1999.
@@ -28,27 +28,50 @@ td_thr_clear_event (th, event)
const td_thrhandle_t *th;
td_thr_events_t *event;
{
+ td_err_e err;
+ psaddr_t eventmask;
+ void *copy;
+
LOG ("td_thr_clear_event");
- /* Write the new value into the thread data structure. */
- td_thr_events_t old_event;
- if (ps_pdread (th->th_ta_p->ph,
- ((char *) th->th_unique
- + offsetof (struct pthread, eventbuf.eventmask)),
- &old_event, sizeof (td_thrhandle_t)) != PS_OK)
- return TD_ERR; /* XXX Other error value? */
-
- /* Remove the set bits in. */
- int i;
- for (i = 0; i < TD_EVENTSIZE; ++i)
- old_event.event_bits[i] &= ~event->event_bits[i];
-
- /* Write the new value into the thread data structure. */
- if (ps_pdwrite (th->th_ta_p->ph,
- ((char *) th->th_unique
- + offsetof (struct pthread, eventbuf.eventmask)),
- &old_event, sizeof (td_thrhandle_t)) != PS_OK)
- return TD_ERR; /* XXX Other error value? */
-
- return TD_OK;
+ /* Fetch the old event mask from the inferior and modify it in place. */
+ err = DB_GET_FIELD_ADDRESS (eventmask, th->th_ta_p,
+ th->th_unique, pthread, eventbuf_eventmask, 0);
+ if (err == TD_OK)
+ err = DB_GET_STRUCT (copy, th->th_ta_p, eventmask, td_thr_events_t);
+ if (err == TD_OK)
+ {
+ uint32_t idx;
+ for (idx = 0; idx < TD_EVENTSIZE; ++idx)
+ {
+ psaddr_t word;
+ uint32_t mask;
+ err = DB_GET_FIELD_LOCAL (word, th->th_ta_p, copy,
+ td_thr_events_t, event_bits, idx);
+ if (err != TD_OK)
+ break;
+ mask = (uintptr_t) word;
+ mask &= ~event->event_bits[idx];
+ word = (psaddr_t) (uintptr_t) mask;
+ err = DB_PUT_FIELD_LOCAL (th->th_ta_p, copy,
+ td_thr_events_t, event_bits, idx, word);
+ if (err != TD_OK)
+ break;
+ }
+ if (err == TD_NOAPLIC)
+ {
+ err = TD_OK;
+ while (idx < TD_EVENTSIZE)
+ if (event->event_bits[idx++] != 0)
+ {
+ err = TD_NOEVENT;
+ break;
+ }
+ }
+ if (err == TD_OK)
+ /* Now write it back to the inferior. */
+ err = DB_PUT_STRUCT (th->th_ta_p, eventmask, td_thr_events_t, copy);
+ }
+
+ return err;
}