X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fstat%2Fstatev.c;h=3d8cc4f1b90a95891f7d86892469776e7af26353;hb=4752f6775544c51874275686d035b9c39b911747;hp=060fd4ff030368335ef97aec2b29a75fb08da481;hpb=46e06d82f0383a613cf21ff7a137feb395fbeb46;p=libfirm

diff --git a/ir/stat/statev.c b/ir/stat/statev.c
index 060fd4ff0..3d8cc4f1b 100644
--- a/ir/stat/statev.c
+++ b/ir/stat/statev.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -22,110 +22,85 @@
  * @brief       Statistic events.
  * @author      Sebastian Hack
  * @date        17.06.2007
- * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
-
-#include <libcore/lc_timing.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <regex.h>
 
 #include "util.h"
-#include "hashptr.h"
+#include "stat_timing.h"
 #include "irprintf.h"
+#include "statev.h"
 
-#define MAX_CTX 128
-
-typedef struct {
-	char key[32];
-	char value[96];
-	unsigned hash;
-} ctx_t;
-
-static ctx_t ctx_stack[MAX_CTX];
+#include "config.h"
 
-static unsigned long time_in_ev = 0;
-static int ctx_sp     = -1;
-static FILE *file_ev  = NULL;
+#ifndef DISABLE_STATEV
 
-static lc_timer_t *timer = NULL;
+#define MAX_TIMER 256
 
-int stat_ev_enabled = 0;
+static FILE* stat_ev_file  = NULL;
 
-#define get_time() lc_timer_elapsed_msec(timer)
+int            stat_ev_enabled = 0;
+int            stat_ev_timer_sp = 0;
+timing_ticks_t stat_ev_timer_elapsed[MAX_TIMER];
+timing_ticks_t stat_ev_timer_start[MAX_TIMER];
 
-void stat_ev_ctx_push(const char *key, const char *value)
+static regex_t regex;
+static regex_t *filter = NULL;
+static inline int key_matches(const char *key)
 {
-	if (file_ev) {
-		unsigned long start = get_time();
-		ctx_t *ctx    = &ctx_stack[ctx_sp + 1];
-		unsigned hash = firm_fnv_hash_str(key);
-
-		hash = HASH_COMBINE(hash, firm_fnv_hash_str(value));
-		if (ctx_sp >= 0)
-			hash = HASH_COMBINE(hash, ctx_stack[ctx_sp].hash);
+	if (!filter)
+		return 1;
 
-		strncpy(ctx->key, key, array_size(ctx->key));
-		strncpy(ctx->value, value, array_size(ctx->key));
-		ctx->hash  = hash | 1;
-		++ctx_sp;
-
-		fprintf(file_ev, "P %10x %30s %30s\n", ctx->hash, key, value);
-
-		time_in_ev += get_time() - start;
-	}
+	return regexec(filter, key, 0, NULL, 0) == 0;
 }
 
-void stat_ev_ctx_push_fobj(const char *key, const void *firm_object)
+void stat_ev_printf(char ev, const char *key, const char *fmt, ...)
 {
-	char buf[96];
-	ir_snprintf(buf, sizeof(buf), "%+F", firm_object);
-	stat_ev_ctx_push(key, buf);
-}
-
-void stat_ev_ctx_pop(void)
-{
-	if (ctx_sp >= 0) {
-		if (file_ev)
-			fprintf(file_ev, "O %10x\n", ctx_stack[ctx_sp].hash);
-		--ctx_sp;
-	}
-}
-
-void stat_ev_emit(const char *name, double value)
-{
-	if (file_ev) {
-		unsigned long start = get_time();
-		unsigned         id = ctx_sp >= 0 ? ctx_stack[ctx_sp].hash : 0;
-
-		fprintf(file_ev, "E %10x %30s %30f %10ld %10ld\n", id, name, value, start, time_in_ev);
-		time_in_ev += get_time() - start;
+	if (!key_matches(key))
+		return;
+
+	fprintf(stat_ev_file, "%c;%s", ev, key);
+	if (fmt != NULL) {
+		char buf[256];
+		va_list args;
+
+		va_start(args, fmt);
+		ir_vsnprintf(buf, sizeof(buf), fmt, args);
+		va_end(args);
+		fprintf(stat_ev_file, ";%s", buf);
 	}
+	fprintf(stat_ev_file, "\n");
 }
 
-void stat_ev_begin(const char *prefix)
+void stat_ev_begin(const char *prefix, const char *filt)
 {
 	char buf[512];
 
 	snprintf(buf, sizeof(buf), "%s.ev", prefix);
+	stat_ev_file = fopen(buf, "wt");
 
-	stat_ev_enabled = 1;
-	ctx_sp     = -1;
-	time_in_ev = 0;
-	file_ev    = fopen(buf, "wt");
-	timer      = lc_timer_register("stat_ev", "firm stat event timer");
+	if (filt && filt[0] != '\0') {
+		filter = NULL;
+		if (regcomp(&regex, filt, REG_EXTENDED) == 0)
+			filter = &regex;
+	}
 
-	lc_timer_start(timer);
+	stat_ev_enabled = stat_ev_file != NULL;
 }
 
 void stat_ev_end(void)
 {
-	if (timer)
-		lc_timer_stop(timer);
-	if (file_ev)
-		fclose(file_ev);
+	if (stat_ev_file) {
+		fclose(stat_ev_file);
+	}
+	if (filter != NULL)
+		regfree(filter);
 }
+
+#endif