Changeset: 42eeb9c43c20 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=42eeb9c43c20
Modified Files:
gdk/gdk_delta.h
gdk/gdk_tracer.c
Branch: gdk_tracer
Log Message:
Compilation fix
diffs (133 lines):
diff --git a/gdk/gdk_delta.h b/gdk/gdk_delta.h
--- a/gdk/gdk_delta.h
+++ b/gdk/gdk_delta.h
@@ -17,19 +17,19 @@
* e.g. a BAT[void,bit] is (at least) integer aligned. This optimizes
* processing on such BATs (DDBENCH).
*/
-#define DELTAinit(P1) \
- do { \
- BATsetcount((P1), 0); \
- (P1)->theap.free = 0; \
- (P1)->batInserted = 0; \
- (P1)->tshift = ATOMelmshift(Tsize(P1)); \
- DEBUG(DELTA, \
- "%s free %zu ins " BUNFMT \
- " base %p\n", \
- BATgetId(P1), \
- (P1)->theap.free, \
- (P1)->batInserted, \
- (P1)->theap.base); \
+#define DELTAinit(P1) \
+ do {
\
+ BATsetcount((P1), 0); \
+ (P1)->theap.free = 0; \
+ (P1)->batInserted = 0; \
+ (P1)->tshift = ATOMelmshift(Tsize(P1)); \
+ DEBUG(DELTA,
\
+ "%s free %zu ins " BUNFMT \
+ " base %p\n",
\
+ BATgetId(P1),
\
+ (P1)->theap.free,
\
+ (P1)->batInserted,
\
+ (P1)->theap.base);
\
} while (0)
/*
* Upon saving a BAT, we should convert the delta marker BUN pointers
diff --git a/gdk/gdk_tracer.c b/gdk/gdk_tracer.c
--- a/gdk/gdk_tracer.c
+++ b/gdk/gdk_tracer.c
@@ -187,16 +187,18 @@ static int
static gdk_return
-_GDKtracer_layer_level_helper(int *layer, int *level)
+_GDKtracer_layer_level_helper(int *layer, int *Level)
{
char *tmp = NULL;
char *tok = NULL;
+ LOG_LEVEL level = (LOG_LEVEL)*Level;
+
for(int i = 0; i < COMPONENTS_COUNT; i++)
{
if(*layer == MDB_ALL)
{
- if(LVL_PER_COMPONENT[i] != *level)
- LVL_PER_COMPONENT[i] = *level;
+ if(LVL_PER_COMPONENT[i] != level)
+ LVL_PER_COMPONENT[i] = level;
}
else
{
@@ -212,18 +214,18 @@ static gdk_return
{
case SQL_ALL:
if(strcmp(tok, "SQL") == 0)
- if(LVL_PER_COMPONENT[i] != *level)
- LVL_PER_COMPONENT[i] = *level;
+ if(LVL_PER_COMPONENT[i] != level)
+ LVL_PER_COMPONENT[i] = level;
break;
case MAL_ALL:
if(strcmp(tok, "MAL") == 0)
- if(LVL_PER_COMPONENT[i] != *level)
- LVL_PER_COMPONENT[i] = *level;
+ if(LVL_PER_COMPONENT[i] != level)
+ LVL_PER_COMPONENT[i] = level;
break;
case GDK_ALL:
if(strcmp(tok, "GDK") == 0)
- if(LVL_PER_COMPONENT[i] != *level)
- LVL_PER_COMPONENT[i] = *level;
+ if(LVL_PER_COMPONENT[i] != level)
+ LVL_PER_COMPONENT[i] = level;
break;
default:
break;
@@ -274,18 +276,20 @@ GDKtracer_stop(void)
gdk_return
-GDKtracer_set_component_level(int *comp, int *level)
+GDKtracer_set_component_level(int *comp, int *Level)
{
- if(LVL_PER_COMPONENT[*comp] == *level)
+ LOG_LEVEL level = (LOG_LEVEL)*Level;
+
+ if(LVL_PER_COMPONENT[*comp] == level)
return GDK_SUCCEED;
if(!_GDKtracer_component_exists(comp))
return GDK_FAIL;
- if(!_GDKtracer_level_exists(level))
+ if(!_GDKtracer_level_exists(Level))
return GDK_FAIL;
- LVL_PER_COMPONENT[*comp] = *level;
+ LVL_PER_COMPONENT[*comp] = level;
return GDK_SUCCEED;
}
@@ -330,15 +334,17 @@ GDKtracer_reset_layer_level(int *layer)
gdk_return
-GDKtracer_set_flush_level(int *level)
+GDKtracer_set_flush_level(int *Level)
{
- if(CUR_FLUSH_LEVEL == *level)
+ LOG_LEVEL level = (LOG_LEVEL)*Level;
+
+ if(CUR_FLUSH_LEVEL == level)
return GDK_SUCCEED;
- if(!_GDKtracer_level_exists(level))
+ if(!_GDKtracer_level_exists(Level))
return GDK_FAIL;
- CUR_FLUSH_LEVEL = *level;
+ CUR_FLUSH_LEVEL = level;
return GDK_SUCCEED;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
