Changeset: cc1d71a81796 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cc1d71a81796
Modified Files:
gdk/gdk.h
gdk/gdk_align.c
gdk/gdk_hash.c
gdk/gdk_heap.c
gdk/gdk_logger.c
gdk/gdk_project.c
gdk/gdk_select.c
gdk/gdk_storage.c
gdk/gdk_tracer.c
gdk/gdk_tracer.h
Branch: default
Log Message:
Layout.
diffs (truncated from 1497 to 300 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1380,7 +1380,7 @@ gdk_export void OIDXdestroy(BAT *b);
* The functions to convert BATs into ASCII. They are primarily meant for ease
of
* debugging and to a lesser extent for output processing. Printing a
* BAT is done essentially by looping through its components, printing
- * each association.
+ * each association.
*
*/
gdk_export gdk_return BATprintcolumns(stream *s, int argc, BAT *argv[]);
@@ -1800,7 +1800,7 @@ bunfastapp(BAT *b, const void *v)
GDK_FAIL : \
((b)->theap.free += sizeof(TYPE), \
((TYPE *) (b)->theap.base)[(b)->batCount++] = * (const TYPE *) (v), \
- GDK_SUCCEED))
+ GDK_SUCCEED))
static inline gdk_return tfastins_nocheckVAR(BAT *b, BUN p, const void *v, int
s)
__attribute__((__warn_unused_result__));
diff --git a/gdk/gdk_align.c b/gdk/gdk_align.c
--- a/gdk/gdk_align.c
+++ b/gdk/gdk_align.c
@@ -164,7 +164,7 @@ BATmaterialize(BAT *b)
p = 0;
q = BUNlast(b);
assert(cnt >= q - p);
- TRC_DEBUG(ALGO, "BATmaterialize(" ALGOBATFMT ")\n", ALGOBATPAR(b));
+ TRC_DEBUG(ALGO, "BATmaterialize(" ALGOBATFMT ")\n", ALGOBATPAR(b));
if (tt != TYPE_void) {
/* no voids */
diff --git a/gdk/gdk_hash.c b/gdk/gdk_hash.c
--- a/gdk/gdk_hash.c
+++ b/gdk/gdk_hash.c
@@ -536,7 +536,7 @@ BATcheckhash(BAT *b)
}
ret = b->thash != NULL;
if (ret)
- TRC_DEBUG(ACCELERATOR,
+ TRC_DEBUG(ACCELERATOR,
"(" ALGOBATFMT "): already has hash, waited "
LLFMT " usec\n", ALGOBATPAR(b), t);
return ret;
}
@@ -604,7 +604,7 @@ BAThashsave(BAT *b, bool dosync)
rc = GDK_SUCCEED;
}
}
- TRC_DEBUG(ACCELERATOR,
+ TRC_DEBUG(ACCELERATOR,
"(" ALGOBATFMT ") persisting hash %s%s
(" LLFMT " usec)%s\n", ALGOBATPAR(b), hp->filename, dosync ? "" : " no sync",
GDKusec() - t0, rc == GDK_SUCCEED ? "" : " failed");
}
}
@@ -695,11 +695,11 @@ BAThash_impl(BAT *b, BAT *s, const char
PROPrec *prop;
TRC_DEBUG_IF(ACCELERATOR) t0 = GDKusec();
- TRC_DEBUG(ACCELERATOR,
+ TRC_DEBUG(ACCELERATOR,
"BAThash(" ALGOBATFMT "): create hash;\n",
ALGOBATPAR(b));
if (b->ttype == TYPE_void) {
if (is_oid_nil(b->tseqbase)) {
- TRC_DEBUG(ACCELERATOR,
+ TRC_DEBUG(ACCELERATOR,
"cannot create hash-table on void-NIL
column.\n");
GDKerror("BAThash: no hash on void/nil column\n");
return NULL;
@@ -847,7 +847,7 @@ BAThash_impl(BAT *b, BAT *s, const char
break;
}
TRC_DEBUG_IF(ACCELERATOR) if (p < cnt1)
- TRC_DEBUG_ENDIF(ACCELERATOR,
+ TRC_DEBUG_ENDIF(ACCELERATOR,
"(%s): abort starthash with "
"mask " BUNFMT " at " BUNFMT " after " LLFMT "
usec\n", BATgetId(b), mask, p, GDKusec() - t1);
if (p == cnt1 || mask == maxmask)
@@ -922,7 +922,7 @@ BAThash_impl(BAT *b, BAT *s, const char
b->batDirtydesc = true;
}
TRC_DEBUG_IF(ACCELERATOR) {
- TRC_DEBUG_ENDIF(ACCELERATOR,
+ TRC_DEBUG_ENDIF(ACCELERATOR,
"hash construction " LLFMT " usec\n", GDKusec()
- t0);
HASHcollisions(b, h, __func__);
}
@@ -957,7 +957,7 @@ BAThash(BAT *b)
}
return GDK_SUCCEED;
} else
- TRC_DEBUG(ACCELERATOR,
+ TRC_DEBUG(ACCELERATOR,
"NOT persisting hash %d\n",
b->batCacheid);
#endif
}
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -629,7 +629,7 @@ HEAPload_intern(Heap *h, const char *nme
if (truncsize < h->size &&
(fd = GDKfdlocate(h->farmid, nme, "mrb+", ext)) >= 0) {
ret = ftruncate(fd, truncsize);
- TRC_DEBUG(HEAP,
+ TRC_DEBUG(HEAP,
"ftruncate(file=%s.%s, size=%zu"
") = %d\n", nme, ext, truncsize, ret);
close(fd);
@@ -714,7 +714,7 @@ HEAPsave_intern(Heap *h, const char *nme
} else if (store != STORE_MEM) {
store = h->storage;
}
- TRC_DEBUG(HEAP,
+ TRC_DEBUG(HEAP,
"(%s.%s,storage=%d,free=%zu,size=%zu,dosync=%s)\n",
nme, ext, (int) h->newstorage, h->free, h->size,
dosync?"true":"false");
@@ -865,7 +865,7 @@ HEAP_printstatus(Heap *heap)
size_t block, cur_free = hheader->head;
CHUNK *blockp;
- TRC_DEBUG(TRACE,
+ TRC_DEBUG(TRACE,
"HEAP has head %zu and alignment %d and size %zu\n",
hheader->head, hheader->alignment, heap->free);
@@ -876,7 +876,7 @@ HEAP_printstatus(Heap *heap)
blockp = HEAP_index(heap, block, CHUNK);
if (block == cur_free) {
- TRC_DEBUG(TRACE,
+ TRC_DEBUG(TRACE,
"Free block at %p has size %zu and next %zu\n",
(void *)block,
blockp->size, blockp->next);
@@ -886,7 +886,7 @@ HEAP_printstatus(Heap *heap)
} else {
size_t size = blocksize(hheader, blockp);
- TRC_DEBUG(TRACE,
+ TRC_DEBUG(TRACE,
"Block at %zu with size %zu\n",
block, size);
block += size;
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -647,7 +647,7 @@ log_read_updates(logger *lg, trans *tr,
if (h == NULL)
res = LOG_EOF;
- else if (BUNappend(uid, h,
true) != GDK_SUCCEED)
+ else if (BUNappend(uid, h,
true) != GDK_SUCCEED)
res = LOG_ERR;
}
}
@@ -2976,7 +2976,7 @@ log_delta(logger *lg, BAT *uid, BAT *uva
BATiter ui = bat_iterator(uid);
const oid *id = BUNtail(ui, 0);
- if (mnstr_write(lg->log, &compress, 1, 1) != 1)
+ if (mnstr_write(lg->log, &compress, 1, 1) != 1)
return GDK_FAIL;
if (compress) {
oid seq = uid->tseqbase;
diff --git a/gdk/gdk_project.c b/gdk/gdk_project.c
--- a/gdk/gdk_project.c
+++ b/gdk/gdk_project.c
@@ -240,7 +240,7 @@ BATproject(BAT *l, BAT *r)
struct canditer ci, *lci = NULL;
lng t0 = GDKusec();
- TRC_DEBUG(ALGO, "%s(l=" ALGOBATFMT ","
+ TRC_DEBUG(ALGO, "%s(l=" ALGOBATFMT ","
"r=" ALGOBATFMT ")\n",
__func__,
ALGOBATPAR(l), ALGOBATPAR(r));
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -45,7 +45,7 @@ virtualize(BAT *bn)
* (const oid *) Tloc(bn, BUNlast(bn) - 1))) {
/* column is dense, replace by virtual oid */
TRC_DEBUG(ALGO, "%s(bn=" ALGOBATFMT ",seq="OIDFMT")\n",
- __func__,
+ __func__,
ALGOBATPAR(bn),
BATcount(bn) > 0 ? * (const oid *)
Tloc(bn, 0) : 0);
if (BATcount(bn) == 0)
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -651,7 +651,7 @@ DESCclean(BAT *b)
b->tvheap->dirty = false;
}
-/* spawning the background msync should be done carefully
+/* spawning the background msync should be done carefully
* because there is a (small) chance that the BAT has been
* deleted by the time you issue the msync.
* This leaves you with possibly deadbeef BAT descriptors.
diff --git a/gdk/gdk_tracer.c b/gdk/gdk_tracer.c
--- a/gdk/gdk_tracer.c
+++ b/gdk/gdk_tracer.c
@@ -10,7 +10,8 @@
#include "gdk.h"
#include "gdk_tracer.h"
-static gdk_tracer tracer = { .id = 0, .allocated_size = 0 };
+static gdk_tracer tracer = {.id = 0, .allocated_size = 0};
+
static gdk_tracer *active_tracer = &tracer;
MT_Lock lock = MT_LOCK_INITIALIZER("GDKtracer_1");
@@ -23,473 +24,468 @@ static LOG_LEVEL CUR_FLUSH_LEVEL = DEFAU
static bool GDK_TRACER_STOP = false;
static const char *LAYER_STR[] = {
- FOREACH_LAYER(GENERATE_STRING)
+ FOREACH_LAYER(GENERATE_STRING)
};
static const char *ADAPTER_STR[] = {
- FOREACH_ADPTR(GENERATE_STRING)
+ FOREACH_ADPTR(GENERATE_STRING)
};
LOG_LEVEL LVL_PER_COMPONENT[] = {
- FOREACH_COMP(GENERATE_LOG_LEVEL)
+ FOREACH_COMP(GENERATE_LOG_LEVEL)
};
-// When BASIC adapter is active, all the log messages are getting output to a
file.
+// When BASIC adapter is active, all the log messages are getting output to a
file.
// This function prepares a file in order to write the contents of the buffer
when necessary.
static gdk_return
_GDKtracer_init_basic_adptr(void)
{
- char file_name[FILENAME_MAX];
- snprintf(file_name, sizeof(file_name), "%s%c%s%c%s%s",
GDKgetenv("gdk_dbpath"), DIR_SEP, FILE_NAME, NAME_SEP,
GDKtracer_get_timestamp("%Y%m%d_%H%M%S"), ".log");
+ char file_name[FILENAME_MAX];
+ snprintf(file_name, sizeof(file_name), "%s%c%s%c%s%s",
GDKgetenv("gdk_dbpath"), DIR_SEP, FILE_NAME, NAME_SEP,
GDKtracer_get_timestamp("%Y%m%d_%H%M%S"), ".log");
- output_file = fopen(file_name, "w");
+ output_file = fopen(file_name, "w");
- if(!output_file)
- {
- GDK_TRACER_EXCEPTION("Failed to initialize BASIC adapter. Could not
open file: %s\n", file_name);
- return GDK_FAIL;
- }
+ if (!output_file) {
+ GDK_TRACER_EXCEPTION("Failed to initialize BASIC adapter. Could
not open file: %s\n", file_name);
+ return GDK_FAIL;
+ }
- return GDK_SUCCEED;
+ return GDK_SUCCEED;
}
static bool
_GDKtracer_adapter_exists(int *adapter)
{
- if(*adapter == ADAPTERS_COUNT)
- return false;
+ if (*adapter == ADAPTERS_COUNT)
+ return false;
- if(*adapter >= 0 && *adapter < ADAPTERS_COUNT)
- return true;
+ if (*adapter >= 0 && *adapter < ADAPTERS_COUNT)
+ return true;
- return false;
+ return false;
}
static bool
_GDKtracer_level_exists(int *lvl)
{
- if(*lvl == LOG_LEVELS_COUNT)
- return false;
+ if (*lvl == LOG_LEVELS_COUNT)
+ return false;
- if(*lvl >= 0 && *lvl < LOG_LEVELS_COUNT)
- return true;
+ if (*lvl >= 0 && *lvl < LOG_LEVELS_COUNT)
+ return true;
- return false;
+ return false;
}
static bool
_GDKtracer_layer_exists(int *layer)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
