Minor scheduler tidyings:

- rename os_thread_t to ThreadOSstate
- remove unused ThreadState.syscall_result_set field
- fix some comments
- add an assertion in VG_(scheduler_init)

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5827

diff --git a/coregrind/m_scheduler/scheduler.c b/coregrind/m_scheduler/scheduler.c
index b1bc09a533e792b6357533815e68b0291f43d451..fe8d1ac5c788fabb836903596670836bb98a3018 100644 (file)
--- a/coregrind/m_scheduler/scheduler.c
+++ b/coregrind/m_scheduler/scheduler.c
@@ -448,6 +448,7 @@ void VG_(scheduler_init) ( Addr clstack_end, SizeT clstack_size )
    }
 
    tid_main = VG_(alloc_ThreadState)();
+   vg_assert(tid_main == 1);
 
    VG_(threads)[tid_main].client_stack_highest_word 
       = clstack_end + 1 - sizeof(UWord);

diff --git a/coregrind/pub_core_threadstate.h b/coregrind/pub_core_threadstate.h
index c4dd5f79f50fc9390c4d0deaff8e3db221010982..5f11d3e2c04aa1db0f5c43fb27b878e5de7efeaf 100644 (file)
--- a/coregrind/pub_core_threadstate.h
+++ b/coregrind/pub_core_threadstate.h
@@ -88,6 +88,7 @@ typedef
 #endif
 
 
+/* Architecture-specific thread state */
 typedef 
    struct {
       /* --- BEGIN vex-mandated guest state --- */
@@ -105,24 +106,28 @@ typedef
    } 
    ThreadArchState;
 
+
 /* OS-specific thread state */
-typedef struct {
-   /* who we are */
-   Int lwpid;                  // PID of kernel task
-   Int threadgroup;            // thread group id
+typedef
+   struct {
+      /* who we are */
+      Int lwpid;        // PID of kernel task
+      Int threadgroup;  // thread group id
 
-   ThreadId parent;            // parent tid (if any)
+      ThreadId parent;  // parent tid (if any)
 
-   /* runtime details */
-   Addr valgrind_stack_base;    // Valgrind's stack (VgStack*)
-   Addr valgrind_stack_init_SP; // starting value for SP
+      /* runtime details */
+      Addr valgrind_stack_base;    // Valgrind's stack (VgStack*)
+      Addr valgrind_stack_init_SP; // starting value for SP
 
-   /* exit details */
-   Int  exitcode;              // in the case of exitgroup, set by someone else
-   Int  fatalsig;              // fatal signal
-} os_thread_t;
+      /* exit details */
+      Int exitcode; // in the case of exitgroup, set by someone else
+      Int fatalsig; // fatal signal
+   }
+   ThreadOSstate;
 
 
+/* Overall thread state */
 typedef struct {
    /* ThreadId == 0 (and hence vg_threads[0]) is NEVER USED.
       The thread identity is simply the index in vg_threads[].
@@ -171,31 +176,26 @@ typedef struct {
       only then is the old one deallocated and a new one
       allocated. 
 
-      For the main thread (threadid == 0), this mechanism doesn't
+      For the main thread (threadid == 1), this mechanism doesn't
       apply.  We don't know the size of the stack since we didn't
       allocate it, and furthermore we never reallocate it. */
 
    /* The allocated size of this thread's stack (permanently zero
-      if this is ThreadId == 0, since we didn't allocate its stack) */
+      if this is ThreadId == 1, since we didn't allocate its stack) */
    SizeT client_stack_szB;
 
    /* Address of the highest legitimate word in this stack.  This is
       used for error messages only -- not critical for execution
       correctness.  Is is set for all stacks, specifically including
-      ThreadId == 0 (the main thread). */
+      ThreadId == 1 (the main thread). */
    Addr client_stack_highest_word;
 
    /* Alternate signal stack */
    vki_stack_t altstack;
 
    /* OS-specific thread state */
-   os_thread_t os_state;
+   ThreadOSstate os_state;
 
-   /* Used in the syscall handlers.  Set to True to indicate that the
-      PRE routine for a syscall has set the syscall result already and
-      so the syscall does not need to be handed to the kernel. */
-   Bool syscall_result_set;
-   
    /* Per-thread jmp_buf to resume scheduler after a signal */
    Bool    sched_jmpbuf_valid;
    jmp_buf sched_jmpbuf;