Minor fixes.

* src/timer.c (struct timer_slot): New member: state.
(timer_start,timer_stop): Keep track of the timer state.
* src/triplet.c: Remove unneeded function.

2 files changed, 19 insertions, 20 deletions

diff --git a/src/timer.c b/src/timer.c
index f5d7c93..268b096 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -23,6 +23,7 @@
 
 struct timer_slot {
     char *name;
+    enum { STOPPED, RUNNING } state;
     double real;
     double self_user;		/* user time in sec */
     double self_system;		/* system time in sec */
@@ -66,23 +67,30 @@ make_key(void)
     pthread_key_create(&key, timer_free);
 }
 
-/* Lookup a timer by its name. If it does not exist, create it. */
-wydawca_timer_t
-timer_get(const char *name)
+struct grecs_symtab *
+get_thread_timer_table(void)
 {
-    struct timer_slot slot, *ret;
-    int install = 1;
     struct grecs_symtab *timer_table;
     
     pthread_once(&key_once, make_key);
     if ((timer_table = pthread_getspecific(key)) == NULL) {
-	timer_table = grecs_symtab_create(sizeof(slot),
+	timer_table = grecs_symtab_create(sizeof(struct timer_slot),
 					  timer_hasher,
 					  NULL, NULL, NULL, NULL);
 	if (!timer_table)
 	    grecs_alloc_die();
 	pthread_setspecific(key, timer_table);
     }
+    return timer_table;
+}
+
+/* Lookup a timer by its name. If it does not exist, create it. */
+wydawca_timer_t
+timer_get(const char *name)
+{
+    struct timer_slot slot, *ret;
+    int install = 1;
+    struct grecs_symtab *timer_table = get_thread_timer_table();
     
     slot.name = (char *)name;
     ret = grecs_symtab_lookup_or_install(timer_table, &slot, &install);
@@ -99,6 +107,7 @@ timer_start(const char *name)
     gettimeofday(&t->real_mark, NULL);
     getrusage(RUSAGE_SELF, &t->self_mark);
     getrusage(RUSAGE_CHILDREN, &t->children_mark);
+    t->state = RUNNING;
     return t;
 }
 
@@ -129,7 +138,10 @@ wydawca_timer_t
 timer_stop(const char *name)
 {
     wydawca_timer_t t = timer_get(name);
-    _timer_compute(t);
+    if (t->state == RUNNING) {
+	_timer_compute(t);
+	t->state = STOPPED;
+    }
     return t;
 }
 
@@ -193,4 +205,3 @@ timer_format_time(double t)
 	grecs_alloc_die();
     return str;
 }
-
diff --git a/src/triplet.c b/src/triplet.c
index a82ac88..d9e503f 100644
--- a/src/triplet.c
+++ b/src/triplet.c
@@ -540,18 +540,6 @@ wy_get_stat_array(void)
     return stat;
 }
 
-WY_STAT_COUNTER *
-wy_get_stat_ptr(int what)
-{
-    WY_STAT_COUNTER *stat;
-    pthread_once(&key_once, make_key);
-    if ((stat = pthread_getspecific(key)) == NULL) {
-	stat = grecs_calloc(WY_MAX_STAT, sizeof(stat[0]));
-	pthread_setspecific(key, stat);
-    }
-    return stat + what;
-}
-
 void *
 wy_thr_triplet(void *ptr)
 {