Changeset: 7c382fe4b4b6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7c382fe4b4b6
Modified Files:
gdk/gdk_atoms.c
gdk/gdk_bbp.c
gdk/gdk_private.h
Branch: Feb2013
Log Message:
A little cleanup.
Use const char * instead of str in a few more places; removed some
unused stuff; turned a variable (locked_by) into volatile.
diffs (232 lines):
diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -1934,7 +1934,7 @@ int GDKatomcnt = TYPE_str + 1;
static str unknown[MAXATOMS] = { NULL };
int
-ATOMunknown_add(str nme)
+ATOMunknown_add(const char *nme)
{
int i = 1;
@@ -1958,7 +1958,7 @@ ATOMunknown_del(int i)
}
int
-ATOMunknown_find(str nme)
+ATOMunknown_find(const char *nme)
{
int i = 1;
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -110,8 +110,8 @@ bat BBPsize = 0; /* current used size o
bat *BBP_hash = NULL; /* BBP logical name hash buckets */
bat BBP_mask = 0; /* number of buckets = & mask */
-static void BBPspin(bat bid, str debug, int event);
-static int BBPfree(BAT *b, str calledFrom);
+static void BBPspin(bat bid, const char *debug, int event);
+static int BBPfree(BAT *b, const char *calledFrom);
static int BBPdestroy(BAT *b);
static void BBPuncacheit(bat bid, int unloaddesc);
static int BBPprepare(bit subcommit);
@@ -147,7 +147,7 @@ static void
BBP_delete(bat i)
{
bat *h = BBP_hash;
- str s = BBP_logical(i);
+ const char *s = BBP_logical(i);
bat idx = (bat) (strHash(s) & BBP_mask);
for (h += idx; (i = *h) != 0; h = &BBP_next(i)) {
@@ -226,7 +226,7 @@ int BBPout = 0; /* bats saved statisti
* read actions are to go on unlocked while other entries in the BBP
* may be modified).
*/
-static MT_Id locked_by = 0;
+static volatile MT_Id locked_by = 0;
static inline MT_Id
BBP_getpid(void)
@@ -307,10 +307,10 @@ BBPinithash(void)
BBP_mask--;
while (--i > 0) {
- str s = BBP_logical(i);
+ const char *s = BBP_logical(i);
if (s) {
- str sm = BBP_logical(-i);
+ const char *sm = BBP_logical(-i);
if (*s != '.' && BBPtmpcheck(s) == 0) {
BBP_insert(i);
@@ -360,21 +360,6 @@ BBPextend(int buildhash)
BBP_notrim = 0;
}
-static inline char *
-BBPparse(str *cur)
-{
- char *base, *c = *cur;
-
- for (c++; GDKisspace(*c); c++)
- ;
- for (base = c; !(GDKisspace(*c) || *c == ','); c++)
- ;
- *c = 0;
- *cur = c;
- return base;
-}
-
-
static inline str
BBPtmpname(str s, int len, bat i)
{
@@ -607,7 +592,7 @@ fixoidheap(void)
{
bat bid;
BATstore *bs;
- str nme, bnme;
+ const char *nme, *bnme;
long_str srcdir;
long_str filename;
size_t len;
@@ -1523,7 +1508,7 @@ BBP_find(const char *nme, int lock)
if (i != 0) {
/* for tmp_X and tmpr_X BATs, we already know X */
- str s;
+ const char *s;
if (ABS(i) >= BBPsize || (s = BBP_logical(i)) == NULL ||
strcmp(s, nme)) {
i = 0;
@@ -1625,7 +1610,7 @@ BBPinsert(BATstore *bs)
{
MT_Id pid = BBP_getpid();
int lock = locked_by ? pid != locked_by : 1;
- str s;
+ const char *s;
long_str dirname;
bat i;
int idx = (int) (pid & BBP_THREADMASK);
@@ -1714,7 +1699,7 @@ BBPinsert(BATstore *bs)
BBPgetsubdir(dirname, i);
nme = BBPphysicalname(name, 64, i);
- BBP_physical(i) = (str) GDKmalloc(strlen(dirname) + strlen(nme)
+ 1 + 1 /* EOS + DIR_SEP */ );
+ BBP_physical(i) = GDKmalloc(strlen(dirname) + strlen(nme) + 1 +
1 /* EOS + DIR_SEP */ );
GDKfilepath(BBP_physical(i), dirname, nme, NULL);
BATDEBUG THRprintf(GDKstdout, "#%d = new %s(%s,%s)\n", (int) i,
BBPname(i), ATOMname(bs->H.type), ATOMname(bs->T.type));
@@ -1796,7 +1781,7 @@ BBPuncacheit(bat i, int unloaddesc)
* BBPclear removes a BAT from the BBP directory forever.
*/
static inline void
-bbpclear(bat i, int idx, str lock)
+bbpclear(bat i, int idx, const char *lock)
{
BATDEBUG {
THRprintf(GDKstdout, "#clear %d (%s)\n", (int) i, BBPname(i));
@@ -1940,7 +1925,7 @@ BBPrename(bat bid, const char *nme)
* memory references can be unloaded.
*/
static inline void
-BBPspin(bat i, str s, int event)
+BBPspin(bat i, const char *s, int event)
{
if (BBPcheck(i, "BBPspin") && (BBP_status(i) & event)) {
lng spin = LL_CONSTANT(0);
@@ -2476,7 +2461,7 @@ BBPdestroy(BAT *b)
}
static int
-BBPfree(BAT *b, str calledFrom)
+BBPfree(BAT *b, const char *calledFrom)
{
bat bid = ABS(b->batCacheid), hp = VIEWhparent(b), tp = VIEWtparent(b),
vhp = VIEWvhparent(b), vtp = VIEWvtparent(b);
int ret;
@@ -2796,8 +2781,6 @@ BBPtrim_select(size_t target, int dirty)
return target;
}
-extern int monet_exec(str);
-
void
BBPtrim(size_t target)
{
@@ -3240,7 +3223,7 @@ static int
BBPbackup(BAT *b, bit subcommit)
{
long_str srcdir, nme;
- str s = BBP_physical(b->batCacheid);
+ const char *s = BBP_physical(b->batCacheid);
if (BBPprepare(subcommit)) {
return -1;
@@ -3391,9 +3374,9 @@ BBPsync(int cnt, bat *subcommit)
* later with the left over files.
*/
static int
-force_move(str srcdir, str dstdir, str name)
+force_move(const char *srcdir, const char *dstdir, const char *name)
{
- char *p;
+ const char *p;
long_str srcpath, dstpath, killfile;
int ret = 0;
@@ -3473,7 +3456,7 @@ BBPrecover(void)
/* move back all files */
while ((dent = readdir(dirp)) != NULL) {
- str q = strchr(dent->d_name, '.');
+ const char *q = strchr(dent->d_name, '.');
if (q == dent->d_name) {
int uret;
@@ -3634,7 +3617,7 @@ BBPdiskscan(const char *parent)
}
while ((dent = readdir(dirp)) != NULL) {
- str p;
+ const char *p;
bat bid;
int ok, delete;
struct stat st;
@@ -3721,7 +3704,7 @@ void
BBPatom_drop(int atom)
{
int i;
- str nme = ATOMname(atom);
+ const char *nme = ATOMname(atom);
int unknown = ATOMunknown_add(nme);
BBPlock("BBPatom_drop");
@@ -3744,7 +3727,7 @@ BBPatom_drop(int atom)
void
BBPatom_load(int atom)
{
- str nme;
+ const char *nme;
int i, unknown;
BBPlock("BBPatom_load");
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -23,9 +23,9 @@ int ALIGNcommit(BAT *b);
int ALIGNundo(BAT *b);
int ATOMheap(int id, Heap *hp, size_t cap);
int ATOMisdescendant(int id, int parentid);
-int ATOMunknown_add(str nme);
+int ATOMunknown_add(const char *nme);
int ATOMunknown_del(int a);
-int ATOMunknown_find(str nme);
+int ATOMunknown_find(const char *nme);
str ATOMunknown_name(int a);
BUN BATbuncount(BAT *b);
int BATcheckmodes(BAT *b, int persistent);
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
