X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fstat%2Fstatev.c;h=1e78d6de2dbcf92665da55d1eeac637f88f1f09c;hb=0f7d29a94fa7c1321861150d63ed1e54eac361bf;hp=3b4fde08eba0742a82f6f7d6eb89a73db731688c;hpb=342c533f49c734dd63afb07a92a8915156369c7d;p=libfirm

diff --git a/ir/stat/statev.c b/ir/stat/statev.c
index 3b4fde08e..1e78d6de2 100644
--- a/ir/stat/statev.c
+++ b/ir/stat/statev.c
@@ -31,6 +31,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <regex.h>
 
 #include "util.h"
 #include "stat_timing.h"
@@ -41,37 +42,15 @@
 
 #ifndef DISABLE_STATEV
 
-#ifdef HAVE_REGEX_H
-#define FIRM_HAVE_REGEX
-#endif
-
-#if defined HAVE_LIBZ && defined HAVE_ZLIB_H
-#define FIRM_HAVE_LIBZ
-#endif
-
-
 #define MAX_TIMER 256
 
-#ifdef FIRM_HAVE_LIBZ
-#include <zlib.h>
-
-#define mfprintf   gzprintf
-static gzFile      stat_ev_file  = NULL;
-
-#else
-
-#define mfprintf   fprintf
-static FILE*       stat_ev_file  = NULL;
-
-#endif /* FIRM_HAVE_LIBZ */
+static FILE* stat_ev_file  = NULL;
 
 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];
 
-#ifdef FIRM_HAVE_REGEX
-#include <regex.h>
 static regex_t regex;
 static regex_t *filter = NULL;
 static inline int key_matches(const char *key)
@@ -82,28 +61,12 @@ static inline int key_matches(const char *key)
 	return regexec(filter, key, 0, NULL, 0) == 0;
 }
 
-#else
-static char filter[128] = { '\0' };
-static inline int key_matches(const char *key)
-{
-	int i = 0;
-
-	for (i = 0; filter[i] != '\0'; ++i) {
-		if (key[i] != filter[i])
-			return 0;
-	}
-
-	return 1;
-}
-#endif /* FIRM_HAVE_REGEX */
-
-
 void stat_ev_printf(char ev, const char *key, const char *fmt, ...)
 {
 	if (!key_matches(key))
 		return;
 
-	mfprintf(stat_ev_file, "%c;%s", ev, key);
+	fprintf(stat_ev_file, "%c;%s", ev, key);
 	if (fmt != NULL) {
 		char buf[256];
 		va_list args;
@@ -111,31 +74,22 @@ void stat_ev_printf(char ev, const char *key, const char *fmt, ...)
 		va_start(args, fmt);
 		ir_vsnprintf(buf, sizeof(buf), fmt, args);
 		va_end(args);
-		mfprintf(stat_ev_file, ";%s", buf);
+		fprintf(stat_ev_file, ";%s", buf);
 	}
-	mfprintf(stat_ev_file, "\n");
+	fprintf(stat_ev_file, "\n");
 }
 
 void stat_ev_begin(const char *prefix, const char *filt)
 {
 	char buf[512];
 
-#ifdef FIRM_HAVE_LIBZ
-	snprintf(buf, sizeof(buf), "%s.ev.gz", prefix);
-	stat_ev_file = gzopen(buf, "wt9");
-#else
 	snprintf(buf, sizeof(buf), "%s.ev", prefix);
 	stat_ev_file = fopen(buf, "wt");
-#endif
 
 	if (filt && filt[0] != '\0') {
-#ifdef FIRM_HAVE_REGEX
 		filter = NULL;
 		if (regcomp(&regex, filt, REG_EXTENDED) == 0)
 			filter = &regex;
-#else
-		strncpy(filter, filt, sizeof(filter) - sizeof(filter[0]));
-#endif /* FIRM_HAVE_REGEX */
 	}
 
 	stat_ev_enabled = stat_ev_file != NULL;
@@ -144,13 +98,10 @@ void stat_ev_begin(const char *prefix, const char *filt)
 void stat_ev_end(void)
 {
 	if (stat_ev_file) {
-#ifdef FIRM_HAVE_LIBZ
-		gzflush(stat_ev_file, 1);
-		gzclose(stat_ev_file);
-#else
 		fclose(stat_ev_file);
-#endif
 	}
+	if (filter != NULL)
+		regfree(filter);
 }
 
 #endif