X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=cdb%2Fwriteable.c;h=4230e62d403e1f788a640bfe8caacd2605535c84;hb=ca258c32ca9f43fa6ddb5642860f310c8b506f2c;hp=15ffed2caffc6ae1312f3a3f5e59a7d792d78d0f;hpb=6c2630597a21671a6b44954cb829b98dd84a22ee;p=chiark-tcl.git diff --git a/cdb/writeable.c b/cdb/writeable.c index 15ffed2..4230e62 100644 --- a/cdb/writeable.c +++ b/cdb/writeable.c @@ -1,26 +1,29 @@ /**/ -#include - #include "chiark_tcl_cdb.h" +#define ftello ftell +#define fseeko fseek +/*---------- Forward declarations ----------*/ struct ht_forall_ctx; - +/*---------- Useful routines ----------*/ static void maybe_close(int fd) { if (fd>=0) close(fd); } -#define PE do{ \ - rc= cht_posixerr(ip, errno, "failed to " PE); goto x_rc; \ +#define PE(m) do{ \ + rc= cht_posixerr(ip, errno, "failed to " m); goto x_rc; \ }while(0) +/*==================== Subsystems and subtypes ====================*/ + /*---------- Pathbuf ----------*/ -typedef struct { +typedef struct Pathbuf { char *buf, *sfx; } Pathbuf; @@ -47,75 +50,64 @@ static void pathbuf_free(Pathbuf *pb) { typedef struct HashTable { Tcl_HashTable t; + Byte padding[128]; /* allow for expansion by Tcl, urgh */ Byte confound[16]; } HashTable; -typedef struct HashDatum { +typedef struct HashValue { int len; Byte data[1]; -} HashDatum; - -static unsigned int hkt_hash(Tcl_HashTable *tht, void *key_v) { - HashTable *ht= (void*)tht; - const HashDatum *key= key_v; - - struct md4_ctx mdc; - Byte mdr[MD4_DIGEST_SIZE]; - - md4_init(&mdc); - md4_update(&mdc, sizeof(ht->confound), ht->confound); - md4_update(&mdc, key->len, key->data); - md4_digest(&mdc, sizeof(mdr), mdr); - assert(sizeof(int) <= MD4_DIGEST_SIZE); - return *(int*)md4; -} - -static const struct Tcl_HashKeyType ht_keytype= { - TCL_HASH_KEY_TYPE_VERSION, 0, - htk_hash, htk_compare, 0, 0 -} +} HashValue; -static HashDatum *htd_prep(int len) { - HashDatum *hd; - hd= TALLOC(offsetof(HashDatum, data) + len); +static HashValue *htv_prep(int len) { + HashValue *hd; + hd= TALLOC((hd->data - (Byte*)hd) + len); hd->len= len; } -static Byte *htd_fillptr(HashDatum *hd) { +static Byte *htv_fillptr(HashValue *hd) { return hd->data; } -static void htd_fill(HashDatum *hd, const Byte *data) { +static void htv_fill(HashValue *hd, const Byte *data) { memcpy(hd->data, data, hd->len); } -static int ht_setup(HashTable *ht) { - rc= cht_get_urandom(ip, ht->confound, sizeof(ht->confound)); - if (rc) return rc; - - Tcl_InitCustomHashTable(&ht->t, TCL_CUSTOM_PTR_KEYS, &ht_keytype); - return TCL_OK; +static void ht_setup(HashTable *ht) { + Tcl_InitHashTable(&ht->t, TCL_STRING_KEYS); } -static void ht_update(HashTable *ht, HashDatum *key_eat, HashDatum *val_eat) { +static void ht_update(HashTable *ht, const char *key, HashValue *val_eat) { Tcl_HashEntry *he; int new; - he= Tcl_CreateHashEntry(&ht->t, key_eat, &new); - /* eats the key! (since the data structure owns the memory) */ + he= Tcl_CreateHashEntry(&ht->t, (char*)key, &new); if (!new) TFREE(Tcl_GetHashValue(he)); + Tcl_SetHashValue(he, val_eat); + /* eats the value since the data structure owns the memory */ +} +static void ht_maybeupdate(HashTable *ht, const char *key, + HashValue *val_eat) { + /* like ht_update except does not overwrite existing values */ + Tcl_HashEntry *he; + int new; + + he= Tcl_CreateHashEntry(&ht->t, (char*)key, &new); + if (!new) { TFREE(val_eat); return; } Tcl_SetHashValue(he, val_eat); } static int ht_forall(HashTable *ht, - int (*fn)(const HashDatum *key, const HashDatum *val, + int (*fn)(const char *key, HashValue *val, struct ht_forall_ctx *ctx), struct ht_forall_ctx *ctx) { - /* Returns first nonzero value returned by any call to fn, or 0. */ + /* Returns first positive value returned by any call to fn, or 0. */ Tcl_HashSearch sp; Tcl_HashEntry *he; - HashDatum *key, *val; + const char *key; + HashValue *val; + int r; for (he= Tcl_FirstHashEntry(&ht->t, &sp); he; - he= Tcl_NextHashEntry(&ht->t, &sp)) { + he= Tcl_NextHashEntry(&sp)) { val= Tcl_GetHashValue(he); if (!val->len) continue; @@ -127,9 +119,24 @@ static int ht_forall(HashTable *ht, return 0; } +static void ht_destroy(HashTable *ht) { + Tcl_HashSearch sp; + Tcl_HashEntry *he; + + for (he= Tcl_FirstHashEntry(&ht->t, &sp); + he; + he= Tcl_NextHashEntry(&sp)) { + /* ht_forall skips empty (deleted) entries so is no good for this */ + TFREE(Tcl_GetHashValue(he)); + } + Tcl_DeleteHashTable(&ht->t); +} + +/*==================== Existential ====================*/ + /*---------- Rw data structure ----------*/ -typedef struct { +typedef struct Rw { int ix, autocompact; int cdb_fd, lock_fd; struct cdb cdb; /* valid iff cdb_fd >= 0 */ @@ -138,57 +145,57 @@ typedef struct { HashTable logincore; Pathbuf pbsome, pbother; off_t mainsz; + ScriptToInvoke on_info, on_lexminval; } Rw; -static void destroy_cdbrw_idtabcb(Tcl_Interp *ip, void *val) { abort(); } - -int rw_close(Interp *ip, Rw *rw) { +static int rw_close(Tcl_Interp *ip, Rw *rw) { int rc, r; rc= TCL_OK; - ht_destroy(rw); + ht_destroy(&rw->logincore); maybe_close(rw->cdb_fd); maybe_close(rw->lock_fd); if (rw->logfile) { r= fclose(rw->logfile); - if (r && ip) { rc= cht_posixerr(ip, errno, "data loss! failed to" + if (r && ip) { rc= cht_posixerr(ip, errno, "probable data loss! failed to" " fclose logfile during untidy close"); } } pathbuf_free(&rw->pbsome); pathbuf_free(&rw->pbother); TFREE(rw); return rc; -}; -void destroy_cdbrw_idtabcb(Interp *ip, Rw *rw) { rw_close(0,rw); } +} +static void destroy_cdbrw_idtabcb(Tcl_Interp *ip, void *rw) { rw_close(0,rw); } const IdDataSpec cdbtcl_rwdatabases= { "cdb-rwdb", "cdb-openrwdatabases-table", destroy_cdbrw_idtabcb }; /*---------- File handling ----------*/ -int acquire_lock(Tcl_Interp *ip, PathBuf *pb, int *lockfd_r) { +static int acquire_lock(Tcl_Interp *ip, Pathbuf *pb, int *lockfd_r) { /* *lockfd_r must be -1 on entry. If may be set to >=0 even * on error, and must be closed by the caller. */ - mode_t umask, lockmode; + mode_t um, lockmode; struct flock fl; + int r; - umask= umask(~(mode_t)0); - umask(umask); + um= umask(~(mode_t)0); + umask(um); - lockmode= 0666 & ~((umask & 0444)>>1); + lockmode= 0666 & ~((um & 0444)>>1); /* Remove r where umask would remove w; * eg umask intending 0664 here gives 0660 */ - *lockfd_r= open(pathbuf_sfx(".lock"), O_RDONLY|O_CREAT, lockmode); + *lockfd_r= open(pathbuf_sfx(pb,".lock"), O_RDONLY|O_CREAT, lockmode); if (*lockfd_r < 0) return cht_posixerr(ip, errno, "could not open/create lockfile"); fl.l_type= F_WRLCK; fl.l_whence= SEEK_SET; fl.l_start= 0; - fl.l_end= 0; + fl.l_len= 0; fl.l_pid= getpid(); r= fcntl(*lockfd_r, F_SETLK, &fl); @@ -198,6 +205,8 @@ int acquire_lock(Tcl_Interp *ip, PathBuf *pb, int *lockfd_r) { else return cht_posixerr(ip, errno, "unexpected error from fcntl while" " acquiring lock"); } + + return TCL_OK; } /*---------- Log reading ----------*/ @@ -225,16 +234,22 @@ static int readlognum(FILE *f, int delim, int *num_r) { } static int readstorelogrecord(FILE *f, HashTable *ht, - void (*updatefn)(HashTable*, HashDatum*, - HashDatum*)) { + int (*omitfn)(const HashValue*, + struct ht_forall_ctx *ctx), + struct ht_forall_ctx *ctx, + void (*updatefn)(HashTable*, const char*, + HashValue*)) { /* returns: - * 0 for OK - * -1 eof - * -2 corrupt or error - * -3 got newline indicating end + * 0 for OK + * -1 eof + * -2 corrupt or error + * -3 got newline indicating end + * >0 value from omitfn */ int keylen, vallen; - HashDatum *key, *val; + char *key; + HashValue *val; + int c, rc, r; c= getc(f); if (c==EOF) { if (feof(f)) return -1; return -2; } @@ -244,22 +259,28 @@ static int readstorelogrecord(FILE *f, HashTable *ht, rc= readlognum(f, ',', &keylen); if (rc) return rc; rc= readlognum(f, ':', &vallen); if (rc) return rc; - key= htd_prep(keylen); - val= htd_prep(vallen); + key= TALLOC(keylen+1); + val= htv_prep(vallen); - r= fread(htd_fillptr(key), 1,keylen, f); + r= fread(key, 1,keylen, f); if (r!=keylen) goto x2_free_keyval; + if (memchr(key,0,keylen)) goto x2_free_keyval; + key[keylen]= 0; c= getc(f); if (c!='-') goto x2_free_keyval; c= getc(f); if (c!='>') goto x2_free_keyval; - r= fread(htd_fillptr(val), 1,vallen, f); + r= fread(htv_fillptr(val), 1,vallen, f); if (r!=vallen) goto x2_free_keyval; - updatefn(ht, key, val); - return TCL_OK; + rc= omitfn ? omitfn(val, ctx) : TCL_OK; + if (rc) { assert(rc>0); TFREE(val); } + else updatefn(ht, key, val); + + TFREE(key); + return rc; -x2_free_keyval; + x2_free_keyval: TFREE(val); TFREE(key); return -2; @@ -271,19 +292,19 @@ int cht_do_cdbwr_create_empty(ClientData cd, Tcl_Interp *ip, const char *pathb) { static const char *const toremoves[]= { ".main", ".cdb", ".log", ".tmp", 0 - } + }; Pathbuf pb; - int lock_fd=-1, fd=-1, rc; + int lock_fd=-1, fd=-1, rc, r; const char *const *toremove; pathbuf_init(&pb, pathb); rc= acquire_lock(ip, &pb, &lock_fd); if (rc) goto x_rc; - fd= open(pathbuf_sfx(".main"), O_RDWR|O_CREAT|O_EXCL, 0666); + fd= open(pathbuf_sfx(&pb, ".main"), O_RDWR|O_CREAT|O_EXCL, 0666); if (fd <= 0) PE("create new database file"); - for (toremoves=toremove; *toremove; toremove++) { + for (toremove=toremoves; *toremove; toremove++) { r= remove(*toremove); if (r && errno != ENOENT) PE("delete possible spurious file during creation"); @@ -298,32 +319,79 @@ int cht_do_cdbwr_create_empty(ClientData cd, Tcl_Interp *ip, return rc; } +/*---------- Info callbacks ----------*/ + +static int infocbv3(Tcl_Interp *ip, Rw *rw, const char *arg1, + const char *arg2fmt, const char *arg3, va_list al) { + Tcl_Obj *aa[3]; + int na; + char buf[200]; + vsnprintf(buf, sizeof(buf), arg2fmt, al); + + na= 0; + aa[na++]= cht_ret_string(ip, arg1); + aa[na++]= cht_ret_string(ip, buf); + if (arg3) aa[na++]= cht_ret_string(ip, arg3); + + return cht_scriptinv_invoke_fg(&rw->on_info, na, aa); +} + +static int infocb3(Tcl_Interp *ip, Rw *rw, const char *arg1, + const char *arg2fmt, const char *arg3, ...) { + int rc; + va_list al; + va_start(al, arg3); + rc= infocbv3(ip,rw,arg1,arg2fmt,arg3,al); + va_end(al); + return rc; +} + +static int infocb(Tcl_Interp *ip, Rw *rw, const char *arg1, + const char *arg2fmt, ...) { + int rc; + va_list al; + va_start(al, arg2fmt); + rc= infocbv3(ip,rw,arg1,arg2fmt,0,al); + va_end(al); + return rc; +} + /*---------- Opening ----------*/ -int cht_do_cdbwr_open(ClientData cd, Tcl_Interp *ip, - const char *pathb, Tcl_Obj *on_info, void **result) { +int cht_do_cdbwr_open(ClientData cd, Tcl_Interp *ip, const char *pathb, + Tcl_Obj *on_info, Tcl_Obj *on_lexminval, + void **result) { const Cdbwr_SubCommand *subcmd= cd; - int rc, mainfd=-1; + int r, rc, mainfd=-1; Rw *rw; struct stat stab; - fpos_t logrecstart; + off_t logrecstart, logjunkpos; rw= TALLOC(sizeof(*rw)); - rc= ht_setup(&rw->logincore); if (rc) { TFREE(rw); return rc; } + ht_setup(&rw->logincore); + cht_scriptinv_init(&rw->on_info); + cht_scriptinv_init(&rw->on_lexminval); rw->cdb_fd= rw->lock_fd= -1; rw->logfile= 0; - pathbuf_init(&rw->pbsome, &pathb); - pathbuf_init(&rw->pbother, &pathb); + pathbuf_init(&rw->pbsome, pathb); + pathbuf_init(&rw->pbother, pathb); rw->autocompact= 1; + if (on_lexminval) { + rc= cht_scriptinv_set(&rw->on_lexminval, ip, on_lexminval, 0); + if (rc) goto x_rc; + } else { + rw->on_lexminval.llength= 0; + } + mainfd= open(pathbuf_sfx(&rw->pbsome,".main"), O_RDONLY); if (mainfd<0) PE("open exist3ing database file .main"); rc= acquire_lock(ip, &rw->pbsome, &rw->lock_fd); if (rc) goto x_rc; - r= stat(mainfd, &stab); if (r) PE("fstat .main"); + r= fstat(mainfd, &stab); if (r) PE("fstat .main"); rw->mainsz= stab.st_size; rw->cdb_fd= open(pathbuf_sfx(&rw->pbsome,".cdb"), O_RDONLY); - if (fd>=0) { + if (rw->cdb_fd >=0) { r= cdb_init(&rw->cdb, rw->cdb_fd); if (r) { rc= cht_posixerr(ip, errno, "failed to initialise cdb reader"); @@ -349,14 +417,14 @@ int cht_do_cdbwr_open(ClientData cd, Tcl_Interp *ip, } else { /* rw->logfile */ r= fstat(fileno(rw->logfile), &stab); if (r==-1) PE("fstat .log during open"); - rc= infocb(rw, "open-dirty-start", "log=%luby", + rc= infocb(ip, rw, "open-dirty-start", "log=%luby", (unsigned long)stab.st_size); if (rc) goto x_rc; for (;;) { - r= fgetpos(rw->logfile, &logrecstart); - if (r) PE("fgetpos .log during (dirty) open"); - r= readstorelogrecord(rw->logfile, &rw->logincore, ht_update); + logrecstart= ftello(rw->logfile); + if (logrecstart < 0) PE("ftello .log during (dirty) open"); + r= readstorelogrecord(rw->logfile, &rw->logincore, 0,0, ht_update); if (ferror(rw->logfile)) { rc= cht_posixerr(ip, errno, "error reading .log during (dirty) open"); goto x_rc; @@ -365,27 +433,27 @@ int cht_do_cdbwr_open(ClientData cd, Tcl_Interp *ip, break; } else if (r==-2 || r==-3) { char buf[100]; - r= fgetpos(rw->logfile, &logjunkpos); - if (r) PE("fgetpos .log during report of junk in dirty open"); + logjunkpos= ftello(rw->logfile); + if(logjunkpos<0) PE("ftello .log during report of junk in dirty open"); snprintf(buf,sizeof(buf), "CDB SYNTAX LOG %lu %lu", - (unsigned long)junkpos, (unsigned long)logrecstart); + (unsigned long)logjunkpos, (unsigned long)logrecstart); if (!(subcmd->flags & RWSCF_OKJUNK)) { Tcl_SetObjErrorCode(ip, Tcl_NewStringObj(buf,-1)); - snprintf(buf,sizeof(buf),"%lu",(unsigned long)junkpos); + snprintf(buf,sizeof(buf),"%lu",(unsigned long)logjunkpos); Tcl_ResetResult(ip); Tcl_AppendResult(ip, "syntax error (junk) in .log during" " (dirty) open, at file position ", buf, (char*)0); rc= TCL_ERROR; goto x_rc; } - rc= infocb(rw, "open-dirty-junk", "errorfpos=%luby {%s}", - (unsigned long)logjunkpos, buf); + rc= infocb3(ip, rw, "open-dirty-junk", "errorfpos=%luby", buf, + (unsigned long)logjunkpos); if (rc) goto x_rc; - r= fsetpos(rw->logfile, logrecstart); - if (r) PE("failed to fsetpos .log before junk during dirty open"); + r= fseeko(rw->logfile, logrecstart, SEEK_SET); + if (r) PE("failed to fseeko .log before junk during dirty open"); r= ftruncate(fileno(rw->logfile), logrecstart); if (r) PE("ftruncate .log to chop junk during dirty open"); @@ -406,29 +474,82 @@ int cht_do_cdbwr_open(ClientData cd, Tcl_Interp *ip, return rc; } -/*---------- Compacting ----------*/ +/*==================== COMPACTING ====================*/ + +struct ht_forall_ctx { + struct cdb_make cdbm; + FILE *mainfile; + int lexminvall; + long *reccount; + const char *lexminval; +}; + +/*---------- helper functions ----------*/ + +static int expiredp(const HashValue *val, struct ht_forall_ctx *a) { + int r, l; + if (!val->len) return 0; + l= val->len < a->lexminvall ? val->len : a->lexminvall; + r= memcmp(val->data, a->lexminval, l); + if (r>0) return 0; + if (r<0) return 1; + return val->len < a->lexminvall; +} + +static int delete_ifexpired(const char *key, HashValue *val, + struct ht_forall_ctx *a) { + if (!expiredp(val, a)) return 0; + val->len= 0; + /* we don't actually need to realloc it to free the memory because + * this will shortly all be deleted as part of the compaction */ + return 0; +} + +static int addto_cdb(const char *key, HashValue *val, + struct ht_forall_ctx *a) { + return cdb_make_add(&a->cdbm, key, strlen(key), val->data, val->len); +} + +static int addto_main(const char *key, HashValue *val, + struct ht_forall_ctx *a) { + int r; + + (*a->reccount)++; + + r= fprintf(a->mainfile, "+%d,%d:%s->", strlen(key), val->len, key); + if (r<0) return -1; + + r= fwrite(val->data, 1, val->len, a->mainfile); + if (r != val->len) return -1; + + return 0; +} + +/*---------- compact main entrypoint ----------*/ -static int compact_core(Tcl_Interp *ip, Rw *rw, unsigned long logsz) { +static int compact_core(Tcl_Interp *ip, Rw *rw, unsigned long logsize, + long *reccount_r) { /* creates new .cdb and .main * closes logfile * leaves .log with old data * leaves cdb fd open onto old db * leaves logincore full of crap */ - int rc; + int r, rc; int cdbfd, cdbmaking; - struct ht_forall_ctx { - struct cdb_make cdbm; - FILE *mainfile; - int count; - } addctx; + off_t errpos, newmainsz; + char buf[100]; + Tcl_Obj *res; + struct ht_forall_ctx a; a.mainfile= 0; cdbfd= -1; cdbmaking= 0; + *reccount_r= 0; + a.reccount= reccount_r; r= fclose(rw->logfile); - if (r) { rc= cht_posixerr(ip, errno, "data loss! failed to fclose" + if (r) { rc= cht_posixerr(ip, errno, "probable data loss! failed to fclose" " logfile during compact"); goto x_rc; } rw->logfile= 0; @@ -436,24 +557,43 @@ static int compact_core(Tcl_Interp *ip, Rw *rw, unsigned long logsz) { logsize, (unsigned long)rw->mainsz); if (rc) goto x_rc; + if (rw->on_lexminval.llength) { + rc= cht_scriptinv_invoke_fg(&rw->on_lexminval, 0,0); + if (rc) goto x_rc; + + res= Tcl_GetObjResult(ip); assert(res); + a.lexminval= Tcl_GetStringFromObj(res, &a.lexminvall); + assert(a.lexminval); + + /* we rely not calling Tcl_Eval during the actual compaction; + * if we did Tcl_Eval then the interp result would be trashed. + */ + rc= ht_forall(&rw->logincore, delete_ifexpired, &a); + + } else { + a.lexminval= ""; + } + /* merge unsuperseded records from main into hash table */ - a.mainfile= fopen(pathbuf_sfx(&rw_pbsome,".main"), "r"); + a.mainfile= fopen(pathbuf_sfx(&rw->pbsome,".main"), "r"); if (!a.mainfile) PE("failed to open .main for reading during compact"); for (;;) { - r= readstorelogrecord(a.mainfile, &rw->logincore, ht_maybeupdate); + r= readstorelogrecord(a.mainfile, &rw->logincore, + expiredp, &a, + ht_maybeupdate); if (ferror(a.mainfile)) { rc= cht_posixerr(ip, errno, "error reading" " .main during compact"); goto x_rc; } if (r==-3) { break; } else if (r==-1 || r==-2) { - r= fgetpos(a.mainfile, &errpos); - if (r) PE("fgetpos .main during report of syntax error"); - snprintf(buf,sizeof(buf), "CDB SYNTAX MAIN %lu", (uunsigned long)errpos); + errpos= ftello(a.mainfile); + if (errpos<0) PE("ftello .main during report of syntax error"); + snprintf(buf,sizeof(buf), "CDB SYNTAX MAIN %lu", (unsigned long)errpos); Tcl_SetObjErrorCode(ip, Tcl_NewStringObj(buf,-1)); - snprintf(buf,sizeof(buf), "%lu", (uunsigned long)errpos); + snprintf(buf,sizeof(buf), "%lu", (unsigned long)errpos); Tcl_ResetResult(ip); Tcl_AppendResult(ip, "syntax error in .main during" " compact, at file position ", buf, (char*)0); @@ -475,10 +615,10 @@ static int compact_core(Tcl_Interp *ip, Rw *rw, unsigned long logsz) { if (r) PE("cdb_make_start during compact"); cdbmaking= 1; - r= ht_forall(&rw->logincore, addto_cdb, &addctx); + r= ht_forall(&rw->logincore, addto_cdb, &a); if (r) PE("cdb_make_add during compact"); - r= cdb_make_finish(&a.cdbm, cdbfd); + r= cdb_make_finish(&a.cdbm); if(r) PE("cdb_make_finish during compact"); cdbmaking= 0; @@ -494,14 +634,16 @@ static int compact_core(Tcl_Interp *ip, Rw *rw, unsigned long logsz) { a.mainfile= fopen(pathbuf_sfx(&rw->pbsome,".tmp"), "w"); if (!a.mainfile) PE("create .tmp for new main during compact"); - a.count= 0; - r= ht_forall(&rw->logincore, addto_main, a.mainfile); + r= ht_forall(&rw->logincore, addto_main, &a); if (r) { rc= cht_posixerr(ip, r, "error writing to new .main" " during compact"); goto x_rc; } r= fflush(a.mainfile); if (r) PE("fflush new main during compact"); r= fdatasync(fileno(a.mainfile)); if (r) PE("fdatasync new main during compact"); + + newmainsz= ftello(a.mainfile); + if (newmainsz<0) PE("ftello new main during compact"); r= fclose(a.mainfile); if (r) PE("fclose new main during compact"); a.mainfile= 0; @@ -509,53 +651,69 @@ static int compact_core(Tcl_Interp *ip, Rw *rw, unsigned long logsz) { r= rename(rw->pbsome.buf, pathbuf_sfx(&rw->pbother,".main")); if (r) PE("install new .main during compact"); + rw->mainsz= newmainsz; + /* done! */ - rc= infocb(ip, rw, "compact-end", "log=%luby main=%luby", - logsize, (unsigned long)rw->mainsz); + rc= infocb(ip, rw, "compact-end", "log=%luby main=%luby nrecs=%l", + logsize, (unsigned long)rw->mainsz, *a.reccount); if (rc) goto x_rc; rc= TCL_OK; x_rc: - if (mainfile) fclose(mainfile); - if (cdbmaking) cdb_make_finish(&a.cdbm, cdbfd); + if (a.mainfile) fclose(a.mainfile); + if (cdbmaking) cdb_make_finish(&a.cdbm); maybe_close(cdbfd); remove(pathbuf_sfx(&rw->pbsome,".tmp")); /* for tidyness */ } - -static void compact_forclose(Tcl_Interp *ip, Rw *rw) { - long logsz; - int rc; - logsz= ftell(rw->logfile); - if (logsz < 0) PE("ftell logfile (during tidy close)"); +/*---------- Closing ----------*/ - rc= compact_core(ip, rw, logsz); if (rc) goto x_rc; +static int compact_forclose(Tcl_Interp *ip, Rw *rw, long *reccount_r) { + off_t logsz; + int r, rc; + + logsz= ftello(rw->logfile); + if (logsz < 0) PE("ftello logfile (during tidy close)"); + + rc= compact_core(ip, rw, logsz, reccount_r); if (rc) goto x_rc; r= remove(pathbuf_sfx(&rw->pbsome,".log")); if (r) PE("remove .log (during tidy close)"); + + return TCL_OK; + +x_rc: return rc; } int cht_do_cdbwr_close(ClientData cd, Tcl_Interp *ip, void *rw_v) { Rw *rw= rw_v; - int rc, compact_rc, infocb_rc; - - if (rw->autocompact) compact_rc= compact_forclose(ip, rw); - else compact_rc= TCL_OK; - - rc= rw_close(ip,rw); - infocb_rc= infocb_close(rw); + int rc, rc_close; + long reccount= -1; + off_t logsz; + + if (rw->autocompact) rc= compact_forclose(ip, rw, &reccount); + else rc= TCL_OK; + + if (!rc) { + if (!rw->logfile) { + logsz= ftello(rw->logfile); + if (logsz < 0) + rc= cht_posixerr(ip, errno, "ftell logfile during close info"); + else + rc= infocb(ip, rw, "close", "main=%luby log=%luby", + rw->mainsz, logsz); + } else if (reccount>=0) { + rc= infocb(ip, rw, "close", "main=%luby nrecs=%l", rw->mainsz, reccount); + } else { + rc= infocb(ip, rw, "close", "main=%luby", rw->mainsz); + } + } + rc_close= rw_close(ip,rw); + if (rc_close) rc= rc_close; cht_tabledataid_disposing(ip, rw_v, &cdbtcl_rwdatabases); - if (!rc) rc= compact_rc; - if (!rc) rc= infocb_rc; return rc; } - -int cht_do_cdbwr_lookup(ClientData cd, Tcl_Interp *ip, void *db, Tcl_Obj *key, Tcl_Obj **result); -int cht_do_cdbwr_lookup_hb(ClientData cd, Tcl_Interp *ip, void *db, HBytes_Value key, HBytes_Value *result); -int cht_do_cdbwr_update(ClientData cd, Tcl_Interp *ip, void *db, Tcl_Obj *key, Tcl_Obj *value); -int cht_do_cdbwr_update_hb(ClientData cd, Tcl_Interp *ip, void *db, HBytes_Value key, HBytes_Value value); -int cht_do_cdbwr_update_quick(ClientData cd, Tcl_Interp *ip, void *db, Tcl_Obj *key, Tcl_Obj *value); -int cht_do_cdbwr_update_quick_hb(ClientData cd, Tcl_Interp *ip, void *db, HBytes_Value key, HBytes_Value value); +/*==================== Other entrypoints ====================*/