Merge branch 'srs.master'

@@ -47,7 +47,6 @@
 #include <errno.h>
 #include <errno.h>
 #include "common.h"
 #include "common.h"
 
 
-
 /* Global data */
 /* Global data */
 _st_vp_t _st_this_vp;           /* This VP */
 _st_vp_t _st_this_vp;           /* This VP */
 _st_thread_t *_st_this_thread;  /* Current thread */
 _st_thread_t *_st_this_thread;  /* Current thread */
@@ -56,575 +55,586 @@ int _st_active_count = 0;       /* Active thread count */
 time_t _st_curr_time = 0;       /* Current time as returned by time(2) */
 time_t _st_curr_time = 0;       /* Current time as returned by time(2) */
 st_utime_t _st_last_tset;       /* Last time it was fetched */
 st_utime_t _st_last_tset;       /* Last time it was fetched */
 
 
-
 int st_poll(struct pollfd *pds, int npds, st_utime_t timeout)
 int st_poll(struct pollfd *pds, int npds, st_utime_t timeout)
 {
 {
-  struct pollfd *pd;
-  struct pollfd *epd = pds + npds;
-  _st_pollq_t pq;
-  _st_thread_t *me = _ST_CURRENT_THREAD();
-  int n;
-
-  if (me->flags & _ST_FL_INTERRUPT) {
-    me->flags &= ~_ST_FL_INTERRUPT;
-    errno = EINTR;
-    return -1;
-  }
-
-  if ((*_st_eventsys->pollset_add)(pds, npds) < 0)
-    return -1;
-
-  pq.pds = pds;
-  pq.npds = npds;
-  pq.thread = me;
-  pq.on_ioq = 1;
-  _ST_ADD_IOQ(pq);
-  if (timeout != ST_UTIME_NO_TIMEOUT)
-    _ST_ADD_SLEEPQ(me, timeout);
-  me->state = _ST_ST_IO_WAIT;
-
-  _ST_SWITCH_CONTEXT(me);
-
-  n = 0;
-  if (pq.on_ioq) {
-    /* If we timed out, the pollq might still be on the ioq. Remove it */
-    _ST_DEL_IOQ(pq);
-    (*_st_eventsys->pollset_del)(pds, npds);
-  } else {
-    /* Count the number of ready descriptors */
-    for (pd = pds; pd < epd; pd++) {
-      if (pd->revents)
-    n++;
-    }
-  }
-
-  if (me->flags & _ST_FL_INTERRUPT) {
-    me->flags &= ~_ST_FL_INTERRUPT;
-    errno = EINTR;
-    return -1;
-  }
-
-  return n;
+    struct pollfd *pd;
+    struct pollfd *epd = pds + npds;
+    _st_pollq_t pq;
+    _st_thread_t *me = _ST_CURRENT_THREAD();
+    int n;
+    
+    if (me->flags & _ST_FL_INTERRUPT) {
+        me->flags &= ~_ST_FL_INTERRUPT;
+        errno = EINTR;
+        return -1;
+    }
+    
+    if ((*_st_eventsys->pollset_add)(pds, npds) < 0) {
+        return -1;
+    }
+    
+    pq.pds = pds;
+    pq.npds = npds;
+    pq.thread = me;
+    pq.on_ioq = 1;
+    _ST_ADD_IOQ(pq);
+    if (timeout != ST_UTIME_NO_TIMEOUT) {
+        _ST_ADD_SLEEPQ(me, timeout);
+    }
+    me->state = _ST_ST_IO_WAIT;
+    
+    _ST_SWITCH_CONTEXT(me);
+    
+    n = 0;
+    if (pq.on_ioq) {
+        /* If we timed out, the pollq might still be on the ioq. Remove it */
+        _ST_DEL_IOQ(pq);
+        (*_st_eventsys->pollset_del)(pds, npds);
+    } else {
+        /* Count the number of ready descriptors */
+        for (pd = pds; pd < epd; pd++) {
+            if (pd->revents) {
+                n++;
+            }
+        }
+    }
+    
+    if (me->flags & _ST_FL_INTERRUPT) {
+        me->flags &= ~_ST_FL_INTERRUPT;
+        errno = EINTR;
+        return -1;
+    }
+    
+    return n;
 }
 }
 
 
-
 void _st_vp_schedule(void)
 void _st_vp_schedule(void)
 {
 {
-  _st_thread_t *thread;
-
-  if (_ST_RUNQ.next != &_ST_RUNQ) {
-    /* Pull thread off of the run queue */
-    thread = _ST_THREAD_PTR(_ST_RUNQ.next);
-    _ST_DEL_RUNQ(thread);
-  } else {
-    /* If there are no threads to run, switch to the idle thread */
-    thread = _st_this_vp.idle_thread;
-  }
-  ST_ASSERT(thread->state == _ST_ST_RUNNABLE);
-
-  /* Resume the thread */
-  thread->state = _ST_ST_RUNNING;
-  _ST_RESTORE_CONTEXT(thread);
+    _st_thread_t *thread;
+    
+    if (_ST_RUNQ.next != &_ST_RUNQ) {
+        /* Pull thread off of the run queue */
+        thread = _ST_THREAD_PTR(_ST_RUNQ.next);
+        _ST_DEL_RUNQ(thread);
+    } else {
+        /* If there are no threads to run, switch to the idle thread */
+        thread = _st_this_vp.idle_thread;
+    }
+    ST_ASSERT(thread->state == _ST_ST_RUNNABLE);
+    
+    /* Resume the thread */
+    thread->state = _ST_ST_RUNNING;
+    _ST_RESTORE_CONTEXT(thread);
 }
 }
 
 
-
 /*
 /*
  * Initialize this Virtual Processor
  * Initialize this Virtual Processor
  */
  */
 int st_init(void)
 int st_init(void)
 {
 {
-  _st_thread_t *thread;
-
-  if (_st_active_count) {
-    /* Already initialized */
-    return 0;
-  }
-
-  /* We can ignore return value here */
-  st_set_eventsys(ST_EVENTSYS_DEFAULT);
-
-  if (_st_io_init() < 0)
-    return -1;
-
-  memset(&_st_this_vp, 0, sizeof(_st_vp_t));
-
-  ST_INIT_CLIST(&_ST_RUNQ);
-  ST_INIT_CLIST(&_ST_IOQ);
-  ST_INIT_CLIST(&_ST_ZOMBIEQ);
+    _st_thread_t *thread;
+    
+    if (_st_active_count) {
+        /* Already initialized */
+        return 0;
+    }
+    
+    /* We can ignore return value here */
+    st_set_eventsys(ST_EVENTSYS_DEFAULT);
+    
+    if (_st_io_init() < 0) {
+        return -1;
+    }
+    
+    memset(&_st_this_vp, 0, sizeof(_st_vp_t));
+    
+    ST_INIT_CLIST(&_ST_RUNQ);
+    ST_INIT_CLIST(&_ST_IOQ);
+    ST_INIT_CLIST(&_ST_ZOMBIEQ);
 #ifdef DEBUG
 #ifdef DEBUG
-  ST_INIT_CLIST(&_ST_THREADQ);
+    ST_INIT_CLIST(&_ST_THREADQ);
 #endif
 #endif
-
-  if ((*_st_eventsys->init)() < 0)
-    return -1;
-
-  _st_this_vp.pagesize = getpagesize();
-  _st_this_vp.last_clock = st_utime();
-
-  /*
-   * Create idle thread
-   */
-  _st_this_vp.idle_thread = st_thread_create(_st_idle_thread_start,
-                         NULL, 0, 0);
-  if (!_st_this_vp.idle_thread)
-    return -1;
-  _st_this_vp.idle_thread->flags = _ST_FL_IDLE_THREAD;
-  _st_active_count--;
-  _ST_DEL_RUNQ(_st_this_vp.idle_thread);
-
-  /*
-   * Initialize primordial thread
-   */
-  thread = (_st_thread_t *) calloc(1, sizeof(_st_thread_t) +
-                   (ST_KEYS_MAX * sizeof(void *)));
-  if (!thread)
-    return -1;
-  thread->private_data = (void **) (thread + 1);
-  thread->state = _ST_ST_RUNNING;
-  thread->flags = _ST_FL_PRIMORDIAL;
-  _ST_SET_CURRENT_THREAD(thread);
-  _st_active_count++;
+    
+    if ((*_st_eventsys->init)() < 0) {
+        return -1;
+    }
+    
+    _st_this_vp.pagesize = getpagesize();
+    _st_this_vp.last_clock = st_utime();
+    
+    /*
+    * Create idle thread
+    */
+    _st_this_vp.idle_thread = st_thread_create(_st_idle_thread_start, NULL, 0, 0);
+    if (!_st_this_vp.idle_thread) {
+        return -1;
+    }
+    _st_this_vp.idle_thread->flags = _ST_FL_IDLE_THREAD;
+    _st_active_count--;
+    _ST_DEL_RUNQ(_st_this_vp.idle_thread);
+    
+    /*
+    * Initialize primordial thread
+    */
+    thread = (_st_thread_t *) calloc(1, sizeof(_st_thread_t) +
+    (ST_KEYS_MAX * sizeof(void *)));
+    if (!thread) {
+        return -1;
+    }
+    thread->private_data = (void **) (thread + 1);
+    thread->state = _ST_ST_RUNNING;
+    thread->flags = _ST_FL_PRIMORDIAL;
+    _ST_SET_CURRENT_THREAD(thread);
+    _st_active_count++;
 #ifdef DEBUG
 #ifdef DEBUG
-  _ST_ADD_THREADQ(thread);
+    _ST_ADD_THREADQ(thread);
 #endif
 #endif
-
-  return 0;
+    
+    return 0;
 }
 }
 
 
-
 #ifdef ST_SWITCH_CB
 #ifdef ST_SWITCH_CB
 st_switch_cb_t st_set_switch_in_cb(st_switch_cb_t cb)
 st_switch_cb_t st_set_switch_in_cb(st_switch_cb_t cb)
 {
 {
-  st_switch_cb_t ocb = _st_this_vp.switch_in_cb;
-  _st_this_vp.switch_in_cb = cb;
-  return ocb;
+    st_switch_cb_t ocb = _st_this_vp.switch_in_cb;
+    _st_this_vp.switch_in_cb = cb;
+    return ocb;
 }
 }
 
 
 st_switch_cb_t st_set_switch_out_cb(st_switch_cb_t cb)
 st_switch_cb_t st_set_switch_out_cb(st_switch_cb_t cb)
 {
 {
-  st_switch_cb_t ocb = _st_this_vp.switch_out_cb;
-  _st_this_vp.switch_out_cb = cb;
-  return ocb;
+    st_switch_cb_t ocb = _st_this_vp.switch_out_cb;
+    _st_this_vp.switch_out_cb = cb;
+    return ocb;
 }
 }
 #endif
 #endif
 
 
-
 /*
 /*
  * Start function for the idle thread
  * Start function for the idle thread
  */
  */
 /* ARGSUSED */
 /* ARGSUSED */
 void *_st_idle_thread_start(void *arg)
 void *_st_idle_thread_start(void *arg)
 {
 {
-  _st_thread_t *me = _ST_CURRENT_THREAD();
-
-  while (_st_active_count > 0) {
-    /* Idle vp till I/O is ready or the smallest timeout expired */
-    _ST_VP_IDLE();
-
-    /* Check sleep queue for expired threads */
-    _st_vp_check_clock();
-
-    me->state = _ST_ST_RUNNABLE;
-    _ST_SWITCH_CONTEXT(me);
-  }
-
-  /* No more threads */
-  exit(0);
-
-  /* NOTREACHED */
-  return NULL;
+    _st_thread_t *me = _ST_CURRENT_THREAD();
+    
+    while (_st_active_count > 0) {
+        /* Idle vp till I/O is ready or the smallest timeout expired */
+        _ST_VP_IDLE();
+        
+        /* Check sleep queue for expired threads */
+        _st_vp_check_clock();
+        
+        me->state = _ST_ST_RUNNABLE;
+        _ST_SWITCH_CONTEXT(me);
+    }
+    
+    /* No more threads */
+    exit(0);
+    
+    /* NOTREACHED */
+    return NULL;
 }
 }
 
 
-
 void st_thread_exit(void *retval)
 void st_thread_exit(void *retval)
 {
 {
-  _st_thread_t *thread = _ST_CURRENT_THREAD();
-
-  thread->retval = retval;
-  _st_thread_cleanup(thread);
-  _st_active_count--;
-  if (thread->term) {
-    /* Put thread on the zombie queue */
-    thread->state = _ST_ST_ZOMBIE;
-    _ST_ADD_ZOMBIEQ(thread);
-
-    /* Notify on our termination condition variable */
-    st_cond_signal(thread->term);
-
-    /* Switch context and come back later */
-    _ST_SWITCH_CONTEXT(thread);
-
-    /* Continue the cleanup */
-    st_cond_destroy(thread->term);
-    thread->term = NULL;
-  }
-
+    _st_thread_t *thread = _ST_CURRENT_THREAD();
+    
+    thread->retval = retval;
+    _st_thread_cleanup(thread);
+    _st_active_count--;
+    if (thread->term) {
+        /* Put thread on the zombie queue */
+        thread->state = _ST_ST_ZOMBIE;
+        _ST_ADD_ZOMBIEQ(thread);
+        
+        /* Notify on our termination condition variable */
+        st_cond_signal(thread->term);
+        
+        /* Switch context and come back later */
+        _ST_SWITCH_CONTEXT(thread);
+        
+        /* Continue the cleanup */
+        st_cond_destroy(thread->term);
+        thread->term = NULL;
+    }
+    
 #ifdef DEBUG
 #ifdef DEBUG
-  _ST_DEL_THREADQ(thread);
+    _ST_DEL_THREADQ(thread);
 #endif
 #endif
-
-  if (!(thread->flags & _ST_FL_PRIMORDIAL))
-    _st_stack_free(thread->stack);
-
-  /* Find another thread to run */
-  _ST_SWITCH_CONTEXT(thread);
-  /* Not going to land here */
+    
+    if (!(thread->flags & _ST_FL_PRIMORDIAL)) {
+        _st_stack_free(thread->stack);
+    }
+    
+    /* Find another thread to run */
+    _ST_SWITCH_CONTEXT(thread);
+    /* Not going to land here */
 }
 }
 
 
-
 int st_thread_join(_st_thread_t *thread, void **retvalp)
 int st_thread_join(_st_thread_t *thread, void **retvalp)
 {
 {
-  _st_cond_t *term = thread->term;
-
-  /* Can't join a non-joinable thread */
-  if (term == NULL) {
-    errno = EINVAL;
-    return -1;
-  }
-  if (_ST_CURRENT_THREAD() == thread) {
-    errno = EDEADLK;
-    return -1;
-  }
-
-  /* Multiple threads can't wait on the same joinable thread */
-  if (term->wait_q.next != &term->wait_q) {
-    errno = EINVAL;
-    return -1;
-  }
-
-  while (thread->state != _ST_ST_ZOMBIE) {
-    if (st_cond_timedwait(term, ST_UTIME_NO_TIMEOUT) != 0)
-      return -1;
-  }
-
-  if (retvalp)
-    *retvalp = thread->retval;
-
-  /*
-   * Remove target thread from the zombie queue and make it runnable.
-   * When it gets scheduled later, it will do the clean up.
-   */
-  thread->state = _ST_ST_RUNNABLE;
-  _ST_DEL_ZOMBIEQ(thread);
-  _ST_ADD_RUNQ(thread);
-
-  return 0;
+    _st_cond_t *term = thread->term;
+    
+    /* Can't join a non-joinable thread */
+    if (term == NULL) {
+        errno = EINVAL;
+        return -1;
+    }
+    if (_ST_CURRENT_THREAD() == thread) {
+        errno = EDEADLK;
+        return -1;
+    }
+    
+    /* Multiple threads can't wait on the same joinable thread */
+    if (term->wait_q.next != &term->wait_q) {
+        errno = EINVAL;
+        return -1;
+    }
+    
+    while (thread->state != _ST_ST_ZOMBIE) {
+        if (st_cond_timedwait(term, ST_UTIME_NO_TIMEOUT) != 0) {
+            return -1;
+        }
+    }
+    
+    if (retvalp) {
+        *retvalp = thread->retval;
+    }
+    
+    /*
+    * Remove target thread from the zombie queue and make it runnable.
+    * When it gets scheduled later, it will do the clean up.
+    */
+    thread->state = _ST_ST_RUNNABLE;
+    _ST_DEL_ZOMBIEQ(thread);
+    _ST_ADD_RUNQ(thread);
+    
+    return 0;
 }
 }
 
 
-
 void _st_thread_main(void)
 void _st_thread_main(void)
 {
 {
-  _st_thread_t *thread = _ST_CURRENT_THREAD();
-
-  /*
-   * Cap the stack by zeroing out the saved return address register
-   * value. This allows some debugging/profiling tools to know when
-   * to stop unwinding the stack. It's a no-op on most platforms.
-   */
-  MD_CAP_STACK(&thread);
-
-  /* Run thread main */
-  thread->retval = (*thread->start)(thread->arg);
-
-  /* All done, time to go away */
-  st_thread_exit(thread->retval);
+    _st_thread_t *thread = _ST_CURRENT_THREAD();
+    
+    /*
+    * Cap the stack by zeroing out the saved return address register
+    * value. This allows some debugging/profiling tools to know when
+    * to stop unwinding the stack. It's a no-op on most platforms.
+    */
+    MD_CAP_STACK(&thread);
+    
+    /* Run thread main */
+    thread->retval = (*thread->start)(thread->arg);
+    
+    /* All done, time to go away */
+    st_thread_exit(thread->retval);
 }
 }
 
 
-
 /*
 /*
  * Insert "thread" into the timeout heap, in the position
  * Insert "thread" into the timeout heap, in the position
  * specified by thread->heap_index.  See docs/timeout_heap.txt
  * specified by thread->heap_index.  See docs/timeout_heap.txt
  * for details about the timeout heap.
  * for details about the timeout heap.
  */
  */
-static _st_thread_t **heap_insert(_st_thread_t *thread) {
-  int target = thread->heap_index;
-  int s = target;
-  _st_thread_t **p = &_ST_SLEEPQ;
-  int bits = 0;
-  int bit;
-  int index = 1;
-
-  while (s) {
-    s >>= 1;
-    bits++;
-  }
-  for (bit = bits - 2; bit >= 0; bit--) {
-    if (thread->due < (*p)->due) {
-      _st_thread_t *t = *p;
-      thread->left = t->left;
-      thread->right = t->right;
-      *p = thread;
-      thread->heap_index = index;
-      thread = t;
-    }
-    index <<= 1;
-    if (target & (1 << bit)) {
-      p = &((*p)->right);
-      index |= 1;
-    } else {
-      p = &((*p)->left);
+static _st_thread_t **heap_insert(_st_thread_t *thread)
+{
+    int target = thread->heap_index;
+    int s = target;
+    _st_thread_t **p = &_ST_SLEEPQ;
+    int bits = 0;
+    int bit;
+    int index = 1;
+    
+    while (s) {
+        s >>= 1;
+        bits++;
     }
     }
-  }
-  thread->heap_index = index;
-  *p = thread;
-  thread->left = thread->right = NULL;
-  return p;
+    
+    for (bit = bits - 2; bit >= 0; bit--) {
+        if (thread->due < (*p)->due) {
+            _st_thread_t *t = *p;
+            thread->left = t->left;
+            thread->right = t->right;
+            *p = thread;
+            thread->heap_index = index;
+            thread = t;
+        }
+        index <<= 1;
+        if (target & (1 << bit)) {
+            p = &((*p)->right);
+            index |= 1;
+        } else {
+            p = &((*p)->left);
+        }
+    }
+    
+    thread->heap_index = index;
+    *p = thread;
+    thread->left = thread->right = NULL;
+    
+    return p;
 }
 }
 
 
-
 /*
 /*
  * Delete "thread" from the timeout heap.
  * Delete "thread" from the timeout heap.
  */
  */
-static void heap_delete(_st_thread_t *thread) {
-  _st_thread_t *t, **p;
-  int bits = 0;
-  int s, bit;
-
-  /* First find and unlink the last heap element */
-  p = &_ST_SLEEPQ;
-  s = _ST_SLEEPQ_SIZE;
-  while (s) {
-    s >>= 1;
-    bits++;
-  }
-  for (bit = bits - 2; bit >= 0; bit--) {
-    if (_ST_SLEEPQ_SIZE & (1 << bit)) {
-      p = &((*p)->right);
-    } else {
-      p = &((*p)->left);
+static void heap_delete(_st_thread_t *thread) 
+{
+    _st_thread_t *t, **p;
+    int bits = 0;
+    int s, bit;
+    
+    /* First find and unlink the last heap element */
+    p = &_ST_SLEEPQ;
+    s = _ST_SLEEPQ_SIZE;
+    while (s) {
+        s >>= 1;
+        bits++;
     }
     }
-  }
-  t = *p;
-  *p = NULL;
-  --_ST_SLEEPQ_SIZE;
-  if (t != thread) {
-    /*
-     * Insert the unlinked last element in place of the element we are deleting
-     */
-    t->heap_index = thread->heap_index;
-    p = heap_insert(t);
+    
+    for (bit = bits - 2; bit >= 0; bit--) {
+        if (_ST_SLEEPQ_SIZE & (1 << bit)) {
+            p = &((*p)->right);
+        } else {
+            p = &((*p)->left);
+        }
+    }
+    
     t = *p;
     t = *p;
-    t->left = thread->left;
-    t->right = thread->right;
-
-    /*
-     * Reestablish the heap invariant.
-     */
-    for (;;) {
-      _st_thread_t *y; /* The younger child */
-      int index_tmp;
-      if (t->left == NULL)
-    break;
-      else if (t->right == NULL)
-    y = t->left;
-      else if (t->left->due < t->right->due)
-    y = t->left;
-      else
-    y = t->right;
-      if (t->due > y->due) {
-    _st_thread_t *tl = y->left;
-    _st_thread_t *tr = y->right;
-    *p = y;
-    if (y == t->left) {
-      y->left = t;
-      y->right = t->right;
-      p = &y->left;
-    } else {
-      y->left = t->left;
-      y->right = t;
-      p = &y->right;
-    }
-    t->left = tl;
-    t->right = tr;
-    index_tmp = t->heap_index;
-    t->heap_index = y->heap_index;
-    y->heap_index = index_tmp;
-      } else {
-    break;
-      }
-    }
-  }
-  thread->left = thread->right = NULL;
+    *p = NULL;
+    --_ST_SLEEPQ_SIZE;
+    if (t != thread) {
+        /*
+        * Insert the unlinked last element in place of the element we are deleting
+        */
+        t->heap_index = thread->heap_index;
+        p = heap_insert(t);
+        t = *p;
+        t->left = thread->left;
+        t->right = thread->right;
+        
+        /*
+        * Reestablish the heap invariant.
+        */
+        for (;;) {
+            _st_thread_t *y; /* The younger child */
+            int index_tmp;
+            
+            if (t->left == NULL) {
+                break;
+            } else if (t->right == NULL) {
+                y = t->left;
+            } else if (t->left->due < t->right->due) {
+                y = t->left;
+            } else {
+                y = t->right;
+            }
+            
+            if (t->due > y->due) {
+                _st_thread_t *tl = y->left;
+                _st_thread_t *tr = y->right;
+                *p = y;
+                if (y == t->left) {
+                    y->left = t;
+                    y->right = t->right;
+                    p = &y->left;
+                } else {
+                    y->left = t->left;
+                    y->right = t;
+                    p = &y->right;
+                }
+                t->left = tl;
+                t->right = tr;
+                index_tmp = t->heap_index;
+                t->heap_index = y->heap_index;
+                y->heap_index = index_tmp;
+            } else {
+                break;
+            }
+        }
+    }
+    
+    thread->left = thread->right = NULL;
 }
 }
 
 
-
 void _st_add_sleep_q(_st_thread_t *thread, st_utime_t timeout)
 void _st_add_sleep_q(_st_thread_t *thread, st_utime_t timeout)
 {
 {
-  thread->due = _ST_LAST_CLOCK + timeout;
-  thread->flags |= _ST_FL_ON_SLEEPQ;
-  thread->heap_index = ++_ST_SLEEPQ_SIZE;
-  heap_insert(thread);
+    thread->due = _ST_LAST_CLOCK + timeout;
+    thread->flags |= _ST_FL_ON_SLEEPQ;
+    thread->heap_index = ++_ST_SLEEPQ_SIZE;
+    heap_insert(thread);
 }
 }
 
 
-
 void _st_del_sleep_q(_st_thread_t *thread)
 void _st_del_sleep_q(_st_thread_t *thread)
 {
 {
-  heap_delete(thread);
-  thread->flags &= ~_ST_FL_ON_SLEEPQ;
+    heap_delete(thread);
+    thread->flags &= ~_ST_FL_ON_SLEEPQ;
 }
 }
 
 
-
 void _st_vp_check_clock(void)
 void _st_vp_check_clock(void)
 {
 {
-  _st_thread_t *thread;
-  st_utime_t elapsed, now;
- 
-  now = st_utime();
-  elapsed = now - _ST_LAST_CLOCK;
-  _ST_LAST_CLOCK = now;
-
-  if (_st_curr_time && now - _st_last_tset > 999000) {
-    _st_curr_time = time(NULL);
-    _st_last_tset = now;
-  }
-
-  while (_ST_SLEEPQ != NULL) {
-    thread = _ST_SLEEPQ;
-    ST_ASSERT(thread->flags & _ST_FL_ON_SLEEPQ);
-    if (thread->due > now)
-      break;
-    _ST_DEL_SLEEPQ(thread);
-
-    /* If thread is waiting on condition variable, set the time out flag */
-    if (thread->state == _ST_ST_COND_WAIT)
-      thread->flags |= _ST_FL_TIMEDOUT;
-
-    /* Make thread runnable */
-    ST_ASSERT(!(thread->flags & _ST_FL_IDLE_THREAD));
-    thread->state = _ST_ST_RUNNABLE;
-    _ST_ADD_RUNQ(thread);
-  }
+    _st_thread_t *thread;
+    st_utime_t elapsed, now;
+    
+    now = st_utime();
+    elapsed = now - _ST_LAST_CLOCK;
+    _ST_LAST_CLOCK = now;
+    
+    if (_st_curr_time && now - _st_last_tset > 999000) {
+        _st_curr_time = time(NULL);
+        _st_last_tset = now;
+    }
+    
+    while (_ST_SLEEPQ != NULL) {
+        thread = _ST_SLEEPQ;
+        ST_ASSERT(thread->flags & _ST_FL_ON_SLEEPQ);
+        if (thread->due > now) {
+            break;
+        }
+        _ST_DEL_SLEEPQ(thread);
+        
+        /* If thread is waiting on condition variable, set the time out flag */
+        if (thread->state == _ST_ST_COND_WAIT) {
+            thread->flags |= _ST_FL_TIMEDOUT;
+        }
+        
+        /* Make thread runnable */
+        ST_ASSERT(!(thread->flags & _ST_FL_IDLE_THREAD));
+        thread->state = _ST_ST_RUNNABLE;
+        _ST_ADD_RUNQ(thread);
+    }
 }
 }
 
 
-
 void st_thread_interrupt(_st_thread_t *thread)
 void st_thread_interrupt(_st_thread_t *thread)
 {
 {
-  /* If thread is already dead */
-  if (thread->state == _ST_ST_ZOMBIE)
-    return;
-
-  thread->flags |= _ST_FL_INTERRUPT;
-
-  if (thread->state == _ST_ST_RUNNING || thread->state == _ST_ST_RUNNABLE)
-    return;
-
-  if (thread->flags & _ST_FL_ON_SLEEPQ)
-    _ST_DEL_SLEEPQ(thread);
-
-  /* Make thread runnable */
-  thread->state = _ST_ST_RUNNABLE;
-  _ST_ADD_RUNQ(thread);
+    /* If thread is already dead */
+    if (thread->state == _ST_ST_ZOMBIE) {
+        return;
+    }
+    
+    thread->flags |= _ST_FL_INTERRUPT;
+    
+    if (thread->state == _ST_ST_RUNNING || thread->state == _ST_ST_RUNNABLE) {
+        return;
+    }
+    
+    if (thread->flags & _ST_FL_ON_SLEEPQ) {
+        _ST_DEL_SLEEPQ(thread);
+    }
+    
+    /* Make thread runnable */
+    thread->state = _ST_ST_RUNNABLE;
+    _ST_ADD_RUNQ(thread);
 }
 }
 
 
-
-_st_thread_t *st_thread_create(void *(*start)(void *arg), void *arg,
-                   int joinable, int stk_size)
+_st_thread_t *st_thread_create(void *(*start)(void *arg), void *arg, int joinable, int stk_size)
 {
 {
-  _st_thread_t *thread;
-  _st_stack_t *stack;
-  void **ptds;
-  char *sp;
+    _st_thread_t *thread;
+    _st_stack_t *stack;
+    void **ptds;
+    char *sp;
 #ifdef __ia64__
 #ifdef __ia64__
-  char *bsp;
+    char *bsp;
 #endif
 #endif
-
-  /* Adjust stack size */
-  if (stk_size == 0)
-    stk_size = ST_DEFAULT_STACK_SIZE;
-  stk_size = ((stk_size + _ST_PAGE_SIZE - 1) / _ST_PAGE_SIZE) * _ST_PAGE_SIZE;
-  stack = _st_stack_new(stk_size);
-  if (!stack)
-    return NULL;
-
-  /* Allocate thread object and per-thread data off the stack */
+    
+    /* Adjust stack size */
+    if (stk_size == 0) {
+        stk_size = ST_DEFAULT_STACK_SIZE;
+    }
+    stk_size = ((stk_size + _ST_PAGE_SIZE - 1) / _ST_PAGE_SIZE) * _ST_PAGE_SIZE;
+    stack = _st_stack_new(stk_size);
+    if (!stack) {
+        return NULL;
+    }
+    
+    /* Allocate thread object and per-thread data off the stack */
 #if defined (MD_STACK_GROWS_DOWN)
 #if defined (MD_STACK_GROWS_DOWN)
-  sp = stack->stk_top;
-#ifdef __ia64__
-  /*
-   * The stack segment is split in the middle. The upper half is used
-   * as backing store for the register stack which grows upward.
-   * The lower half is used for the traditional memory stack which
-   * grows downward. Both stacks start in the middle and grow outward
-   * from each other.
-   */
-  sp -= (stk_size >> 1);
-  bsp = sp;
-  /* Make register stack 64-byte aligned */
-  if ((unsigned long)bsp & 0x3f)
-    bsp = bsp + (0x40 - ((unsigned long)bsp & 0x3f));
-  stack->bsp = bsp + _ST_STACK_PAD_SIZE;
-#endif
-  sp = sp - (ST_KEYS_MAX * sizeof(void *));
-  ptds = (void **) sp;
-  sp = sp - sizeof(_st_thread_t);
-  thread = (_st_thread_t *) sp;
-
-  /* Make stack 64-byte aligned */
-  if ((unsigned long)sp & 0x3f)
-    sp = sp - ((unsigned long)sp & 0x3f);
-  stack->sp = sp - _ST_STACK_PAD_SIZE;
+    sp = stack->stk_top;
+    #ifdef __ia64__
+    /*
+    * The stack segment is split in the middle. The upper half is used
+    * as backing store for the register stack which grows upward.
+    * The lower half is used for the traditional memory stack which
+    * grows downward. Both stacks start in the middle and grow outward
+    * from each other.
+    */
+    sp -= (stk_size >> 1);
+    bsp = sp;
+    /* Make register stack 64-byte aligned */
+    if ((unsigned long)bsp & 0x3f) {
+        bsp = bsp + (0x40 - ((unsigned long)bsp & 0x3f));
+    }
+    stack->bsp = bsp + _ST_STACK_PAD_SIZE;
+    #endif
+    sp = sp - (ST_KEYS_MAX * sizeof(void *));
+    ptds = (void **) sp;
+    sp = sp - sizeof(_st_thread_t);
+    thread = (_st_thread_t *) sp;
+    
+    /* Make stack 64-byte aligned */
+    if ((unsigned long)sp & 0x3f) {
+        sp = sp - ((unsigned long)sp & 0x3f);
+    }
+    stack->sp = sp - _ST_STACK_PAD_SIZE;
 #elif defined (MD_STACK_GROWS_UP)
 #elif defined (MD_STACK_GROWS_UP)
-  sp = stack->stk_bottom;
-  thread = (_st_thread_t *) sp;
-  sp = sp + sizeof(_st_thread_t);
-  ptds = (void **) sp;
-  sp = sp + (ST_KEYS_MAX * sizeof(void *));
-
-  /* Make stack 64-byte aligned */
-  if ((unsigned long)sp & 0x3f)
-    sp = sp + (0x40 - ((unsigned long)sp & 0x3f));
-  stack->sp = sp + _ST_STACK_PAD_SIZE;
+    sp = stack->stk_bottom;
+    thread = (_st_thread_t *) sp;
+    sp = sp + sizeof(_st_thread_t);
+    ptds = (void **) sp;
+    sp = sp + (ST_KEYS_MAX * sizeof(void *));
+    
+    /* Make stack 64-byte aligned */
+    if ((unsigned long)sp & 0x3f) {
+        sp = sp + (0x40 - ((unsigned long)sp & 0x3f));
+    }
+    stack->sp = sp + _ST_STACK_PAD_SIZE;
 #else
 #else
-#error Unknown OS
+    #error Unknown OS
 #endif
 #endif
-
-  memset(thread, 0, sizeof(_st_thread_t));
-  memset(ptds, 0, ST_KEYS_MAX * sizeof(void *));
-
-  /* Initialize thread */
-  thread->private_data = ptds;
-  thread->stack = stack;
-  thread->start = start;
-  thread->arg = arg;
-
+    
+    memset(thread, 0, sizeof(_st_thread_t));
+    memset(ptds, 0, ST_KEYS_MAX * sizeof(void *));
+    
+    /* Initialize thread */
+    thread->private_data = ptds;
+    thread->stack = stack;
+    thread->start = start;
+    thread->arg = arg;
+    
 #ifndef __ia64__
 #ifndef __ia64__
-  _ST_INIT_CONTEXT(thread, stack->sp, _st_thread_main);
+    _ST_INIT_CONTEXT(thread, stack->sp, _st_thread_main);
 #else
 #else
-  _ST_INIT_CONTEXT(thread, stack->sp, stack->bsp, _st_thread_main);
+    _ST_INIT_CONTEXT(thread, stack->sp, stack->bsp, _st_thread_main);
 #endif
 #endif
-
-  /* If thread is joinable, allocate a termination condition variable */
-  if (joinable) {
-    thread->term = st_cond_new();
-    if (thread->term == NULL) {
-      _st_stack_free(thread->stack);
-      return NULL;
-    }
-  }
-
-  /* Make thread runnable */
-  thread->state = _ST_ST_RUNNABLE;
-  _st_active_count++;
-  _ST_ADD_RUNQ(thread);
+    
+    /* If thread is joinable, allocate a termination condition variable */
+    if (joinable) {
+        thread->term = st_cond_new();
+        if (thread->term == NULL) {
+            _st_stack_free(thread->stack);
+            return NULL;
+        }
+    }
+    
+    /* Make thread runnable */
+    thread->state = _ST_ST_RUNNABLE;
+    _st_active_count++;
+    _ST_ADD_RUNQ(thread);
 #ifdef DEBUG
 #ifdef DEBUG
-  _ST_ADD_THREADQ(thread);
+    _ST_ADD_THREADQ(thread);
 #endif
 #endif
-
-  return thread;
+    
+    return thread;
 }
 }
 
 
-
 _st_thread_t *st_thread_self(void)
 _st_thread_t *st_thread_self(void)
 {
 {
-  return _ST_CURRENT_THREAD();
+    return _ST_CURRENT_THREAD();
 }
 }
 
 
-
 #ifdef DEBUG
 #ifdef DEBUG
 /* ARGSUSED */
 /* ARGSUSED */
 void _st_show_thread_stack(_st_thread_t *thread, const char *messg)
 void _st_show_thread_stack(_st_thread_t *thread, const char *messg)
 {
 {
-
 }
 }
 
 
 /* To be set from debugger */
 /* To be set from debugger */
@@ -632,41 +642,43 @@ int _st_iterate_threads_flag = 0;
 
 
 void _st_iterate_threads(void)
 void _st_iterate_threads(void)
 {
 {
-  static _st_thread_t *thread = NULL;
-  static jmp_buf orig_jb, save_jb;
-  _st_clist_t *q;
-
-  if (!_st_iterate_threads_flag) {
+    static _st_thread_t *thread = NULL;
+    static jmp_buf orig_jb, save_jb;
+    _st_clist_t *q;
+    
+    if (!_st_iterate_threads_flag) {
+        if (thread) {
+            memcpy(thread->context, save_jb, sizeof(jmp_buf));
+            MD_LONGJMP(orig_jb, 1);
+        }
+        return;
+    }
+    
     if (thread) {
     if (thread) {
-      memcpy(thread->context, save_jb, sizeof(jmp_buf));
-      MD_LONGJMP(orig_jb, 1);
+        memcpy(thread->context, save_jb, sizeof(jmp_buf));
+        _st_show_thread_stack(thread, NULL);
+    } else {
+        if (MD_SETJMP(orig_jb)) {
+            _st_iterate_threads_flag = 0;
+            thread = NULL;
+            _st_show_thread_stack(thread, "Iteration completed");
+            return;
+        }
+        thread = _ST_CURRENT_THREAD();
+        _st_show_thread_stack(thread, "Iteration started");
     }
     }
-    return;
-  }
-
-  if (thread) {
-    memcpy(thread->context, save_jb, sizeof(jmp_buf));
-    _st_show_thread_stack(thread, NULL);
-  } else {
-    if (MD_SETJMP(orig_jb)) {
-      _st_iterate_threads_flag = 0;
-      thread = NULL;
-      _st_show_thread_stack(thread, "Iteration completed");
-      return;
-    }
-    thread = _ST_CURRENT_THREAD();
-    _st_show_thread_stack(thread, "Iteration started");
-  }
-
-  q = thread->tlink.next;
-  if (q == &_ST_THREADQ)
-    q = q->next;
-  ST_ASSERT(q != &_ST_THREADQ);
-  thread = _ST_THREAD_THREADQ_PTR(q);
-  if (thread == _ST_CURRENT_THREAD())
-    MD_LONGJMP(orig_jb, 1);
-  memcpy(save_jb, thread->context, sizeof(jmp_buf));
-  MD_LONGJMP(thread->context, 1);
+    
+    q = thread->tlink.next;
+    if (q == &_ST_THREADQ) {
+        q = q->next;
+    }
+    ST_ASSERT(q != &_ST_THREADQ);
+    thread = _ST_THREAD_THREADQ_PTR(q);
+    if (thread == _ST_CURRENT_THREAD()) {
+        MD_LONGJMP(orig_jb, 1);
+    }
+    memcpy(save_jb, thread->context, sizeof(jmp_buf));
+    MD_LONGJMP(thread->context, 1);
 }
 }
 #endif /* DEBUG */
 #endif /* DEBUG */