if (fd>=0) close(fd);
}
-#define PE(m) do{ \
- rc= cht_posixerr(ip, errno, "failed to " m); goto x_rc; \
- }while(0)
-
/*==================== Subsystems and subtypes ====================*/
/*---------- Pathbuf ----------*/
static Byte *htv_fillptr(HashValue *hd) {
return hd->data;
}
-#if 0
-static void htv_fill(HashValue *hd, const Byte *data) {
- memcpy(hd->data, data, hd->len);
-}
-#endif
static void ht_setup(HashTable *ht) {
Tcl_InitHashTable(&ht->t, TCL_STRING_KEYS);
Tcl_SetHashValue(he, val_eat);
}
+static const HashValue *ht_lookup(HashTable *ht, const char *key) {
+ Tcl_HashEntry *he;
+
+ he= Tcl_FindHashEntry(&ht->t, key);
+ if (!he) return 0;
+
+ return Tcl_GetHashValue(he);
+}
+
static int ht_forall(HashTable *ht,
int (*fn)(const char *key, HashValue *val,
struct ht_forall_ctx *ctx),
return TCL_OK;
}
-/*---------- Log reading ----------*/
+/*---------- Log reading and writing ----------*/
static int readlognum(FILE *f, int delim, int *num_r) {
int c;
return -2;
}
+static int writerecord(FILE *f, const char *key, const HashValue *val) {
+ int r;
+
+ r= fprintf(f, "+%d,%d:%s->", strlen(key), val->len, key);
+ if (r<0) return -1;
+
+ r= fwrite(val->data, 1, val->len, f);
+ if (r != val->len) return -1;
+
+ return 0;
+}
+
/*---------- Creating ----------*/
int cht_do_cdbwr_create_empty(ClientData cd, Tcl_Interp *ip,
}
mainfd= open(pathbuf_sfx(&rw->pbsome,".main"), O_RDONLY);
- if (mainfd<0) PE("open exist3ing database file .main");
+ if (mainfd<0) PE("open existing database file .main");
rc= acquire_lock(ip, &rw->pbsome, &rw->lock_fd); if (rc) goto x_rc;
r= fstat(mainfd, &stab); if (r) PE("fstat .main");
return rc;
}
+int cht_do_cdbwr_open_okjunk(ClientData cd, Tcl_Interp *ip, const char *pathb,
+ Tcl_Obj *on_info, Tcl_Obj *on_lexminval,
+ void **result) {
+ return cht_do_cdbwr_open(cd,ip,pathb,on_info,on_lexminval,result);
+}
+
/*==================== COMPACTION ====================*/
struct ht_forall_ctx {
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;
+ return writerecord(a->mainfile, key, val);
}
/*---------- compact main entrypoint ----------*/
/*---------- Other compaction-related entrypoints ----------*/
-static int compact_keeopen(Tcl_Interp *ip, Rw *rw, int force) {
+static int compact_keepopen(Tcl_Interp *ip, Rw *rw, int force) {
off_t logsz;
long reccount;
int rc, r;
x_rc:
/* doom! all updates fail after this (because rw->logfile is 0), and
- * we may be usin a lot more RAM than would be ideal. Program will
+ * we may be using a lot more RAM than would be ideal. Program will
* have to reopen if it really wants sanity. */
return rc;
}
int cht_do_cdbwr_compact_force(ClientData cd, Tcl_Interp *ip, void *rw_v) {
- return compact_keeopen(ip, rw_v, 1);
+ return compact_keepopen(ip, rw_v, 1);
}
int cht_do_cdbwr_compact_check(ClientData cd, Tcl_Interp *ip, void *rw_v) {
- return compact_keeopen(ip, rw_v, 0);
+ return compact_keepopen(ip, rw_v, 0);
}
int cht_do_cdbwr_compact_explicit(ClientData cd, Tcl_Interp *ip, void *rw_v) {
rw->autocompact= 1;
return TCL_OK;
}
+
+/*---------- Updateing ----------*/
+
+static int update(Tcl_Interp *ip, Rw *rw, const char *key,
+ const Byte *data, int dlen) {
+ HashValue *val;
+ int rc, r;
+
+ if (!rw->logfile) return cht_staticerr
+ (ip, "previous compact failed; cdbwr must be closed and reopened "
+ "before any further updates", "CDB BROKEN");
+
+ val= htv_prep(dlen); assert(val);
+ memcpy(htv_fillptr(val), data, dlen);
+
+ r= writerecord(rw->logfile, key, val);
+ if (!r) r= fflush(rw->logfile);
+ if (r) PE("write update to logfile");
+
+ ht_update(&rw->logincore, key, val);
+ return compact_keepopen(ip, rw, 0);
+
+ x_rc:
+ TFREE(val);
+ return rc;
+}
+
+int cht_do_cdbwr_update(ClientData cd, Tcl_Interp *ip,
+ void *rw_v, const char *key, Tcl_Obj *value) {
+ int dlen;
+ const char *data;
+ data= Tcl_GetStringFromObj(value, &dlen); assert(data);
+ return update(ip, rw_v, key, data, dlen);
+}
+
+int cht_do_cdbwr_update_hb(ClientData cd, Tcl_Interp *ip,
+ void *rw_v, const char *key, HBytes_Value value) {
+ return update(ip, rw_v, key, cht_hb_data(&value), cht_hb_len(&value));
+}
+
+int cht_do_cdbwr_delete(ClientData cd, Tcl_Interp *ip, void *rw_v,
+ const char *key) {
+ return update(ip, rw_v, key, 0, 0);
+}
+
+/*---------- Lookups ----------*/
+
+static int lookup_rw(Tcl_Interp *ip, void *rw_v, const char *key,
+ const Byte **data_r, int *len_r /* -1 => notfound */) {
+ Rw *rw= rw_v;
+ const HashValue *val;
+
+ val= ht_lookup(&rw->logincore, key);
+ if (val) {
+ if (val->len) { *data_r= val->data; *len_r= val->len; return TCL_OK; }
+ else { *data_r= 0; *len_r= -1; return TCL_OK; }
+ }
+
+ return cht_cdb_lookup_cdb(ip, &rw->cdb, key, strlen(key), data_r, len_r);
+}
+
+int cht_do_cdbwr_lookup(ClientData cd, Tcl_Interp *ip, void *rw_v,
+ const char *key, Tcl_Obj *def,
+ Tcl_Obj **result) {
+ const Byte *data;
+ int dlen, r;
+
+ r= lookup_rw(ip, rw_v, key, &data, &dlen); if (r) return r;
+ return cht_cdb_donesomelookup(ip, rw_v, def, result, data, dlen,
+ cht_cdb_storeanswer_string);
+}
+
+int cht_do_cdbwr_lookup_hb(ClientData cd, Tcl_Interp *ip, void *rw_v,
+ const char *key, Tcl_Obj *def,
+ Tcl_Obj **result) {
+ const Byte *data;
+ int dlen, r;
+
+ r= lookup_rw(ip, rw_v, key, &data, &dlen); if (r) return r;
+ return cht_cdb_donesomelookup(ip, rw_v, def, result, data, dlen,
+ cht_cdb_storeanswer_hb);
+}
~ian / chiark-tcl.git / blobdiff