|
From: <sv...@va...> - 2009-04-01 21:58:55
|
Author: sewardj
Date: 2009-04-01 22:58:36 +0100 (Wed, 01 Apr 2009)
New Revision: 9510
Log:
Remove unused field wq_jmpbuf in ThreadOSState for Darwin.
Modified:
branches/DARWIN/coregrind/m_scheduler/scheduler.c
branches/DARWIN/coregrind/pub_core_threadstate.h
Modified: branches/DARWIN/coregrind/m_scheduler/scheduler.c
===================================================================
--- branches/DARWIN/coregrind/m_scheduler/scheduler.c 2009-04-01 21:37:37 UTC (rev 9509)
+++ branches/DARWIN/coregrind/m_scheduler/scheduler.c 2009-04-01 21:58:36 UTC (rev 9510)
@@ -412,7 +412,6 @@
VG_(memset)(&tst->os_state.child_go, 0, sizeof(tst->os_state.child_go));
VG_(memset)(&tst->os_state.child_done, 0, sizeof(tst->os_state.child_done));
tst->os_state.wq_jmpbuf_valid = False;
- VG_(memset)(&tst->os_state.wq_jmpbuf, 0, sizeof(tst->os_state.wq_jmpbuf));
tst->os_state.remote_port = 0;
tst->os_state.msgh_id = 0;
VG_(memset)(&tst->os_state.mach_args, 0, sizeof(tst->os_state.mach_args));
Modified: branches/DARWIN/coregrind/pub_core_threadstate.h
===================================================================
--- branches/DARWIN/coregrind/pub_core_threadstate.h 2009-04-01 21:37:37 UTC (rev 9509)
+++ branches/DARWIN/coregrind/pub_core_threadstate.h 2009-04-01 21:58:36 UTC (rev 9510)
@@ -167,8 +167,12 @@
// Workqueue re-entry
// (setjmp in PRE(workq_ops), longjmp in wqthread_hijack)
+ // JRS fixme: this comment is no longer correct; wq_jmpbuf is
+ // never used, and there is no such setjmp or longjmp pair.
+ // I guess we could leave wq_jmpbuf_valid in place though, since
+ // it does allow for an assertion in ML_(wqthread_continue_NORETURN).
Bool wq_jmpbuf_valid;
- jmp_buf wq_jmpbuf;
+ //jmp_buf wq_jmpbuf;
// Values saved from transient Mach RPC messages
Addr remote_port; // destination for original message
|