Changeset 5345:2e95587edd07 in roaraudio for roard/include

Timestamp:

12/10/11 00:24:27 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

avoid accessing (semi-)global data directly

File:

• roard/include/roard.h (modified) (1 diff)

roard/include/roard.h

@@ -227 +227 @@
 
 
-#define counters_init() memset(&g_counters, 0, sizeof(g_counters))
+#define counters_init() memset(counters_getptr(), 0, sizeof(struct counters))
 //#define counters_inc(c,i) do { signed long int __i = (i); if ( __i < 0 && __i > (g_counters.cur.c) ) { ROAR_WARN("counters_inc(c=%s, i=%li): Decrement request bigger than current counter value. Counter out of syn!", )  } while (0)
-#define counters_inc(c,i) do { signed long int __i = (i); g_counters.cur.c += __i; if ( __i > 0 ) g_counters.sum.c += __i; } while (0)
-
-#define counters_get(g,c) ((g_counters.g.c))
-
+#define counters_inc(c,i) do { signed long int __i = (i); counters_getptr()->cur.c += __i; if ( __i > 0 ) counters_getptr()->sum.c += __i; } while (0)
+
+#define counters_get(g,c) ((counters_getptr()->g.c))
+
+struct counters * counters_getptr(void);
 void counters_print(int type, int force);