* Reclaim unused space in the databases. We need to do each one of
* these discretely, rather than in a loop.
*/
-void defrag_databases(void) {
+void defrag_databases(void)
+{
/* defrag the message base */
lprintf(7, "Defragmenting message base\n");
gdbm_reorganize(gdbms[CDB_FLOORTAB]);
end_critical_section(S_DATABASE);
end_critical_section(S_FLOORTAB);
- }
+}
/*
* Open the various gdbm databases we'll be using. Any database which
* does not exist should be created.
*/
-void open_databases(void) {
+void open_databases(void)
+{
lprintf(7, "%s\n", gdbm_version);
/*
/* a critical section is unnecessary, as this function is called before
any other threads are created. and it causes problems on BSDI.
- begin_critical_section(S_DATABASE);
+ begin_critical_section(S_DATABASE);
*/
gdbms[CDB_MSGMAIN] = gdbm_open("data/msgmain.gdbm", 8192,
- GDBM_WRCREAT, 0600, NULL);
+ GDBM_WRCREAT, 0600, NULL);
if (gdbms[CDB_MSGMAIN] == NULL) {
lprintf(2, "Cannot open msgmain: %s\n",
gdbm_strerror(gdbm_errno));
exit(1);
- }
-
+ }
gdbms[CDB_USERSUPP] = gdbm_open("data/usersupp.gdbm", 0,
- GDBM_WRCREAT, 0600, NULL);
+ GDBM_WRCREAT, 0600, NULL);
if (gdbms[CDB_USERSUPP] == NULL) {
lprintf(2, "Cannot open usersupp: %s\n",
gdbm_strerror(gdbm_errno));
exit(1);
- }
-
+ }
gdbms[CDB_VISIT] = gdbm_open("data/visit.gdbm", 0,
- GDBM_WRCREAT, 0600, NULL);
+ GDBM_WRCREAT, 0600, NULL);
if (gdbms[CDB_VISIT] == NULL) {
lprintf(2, "Cannot open visit file: %s\n",
gdbm_strerror(gdbm_errno));
exit(1);
- }
-
+ }
gdbms[CDB_QUICKROOM] = gdbm_open("data/quickroom.gdbm", 0,
- GDBM_WRCREAT, 0600, NULL);
+ GDBM_WRCREAT, 0600, NULL);
if (gdbms[CDB_QUICKROOM] == NULL) {
lprintf(2, "Cannot open quickroom: %s\n",
gdbm_strerror(gdbm_errno));
exit(1);
- }
-
+ }
gdbms[CDB_FLOORTAB] = gdbm_open("data/floortab.gdbm", 0,
- GDBM_WRCREAT, 0600, NULL);
+ GDBM_WRCREAT, 0600, NULL);
if (gdbms[CDB_FLOORTAB] == NULL) {
lprintf(2, "Cannot open floortab: %s\n",
gdbm_strerror(gdbm_errno));
exit(1);
- }
-
+ }
gdbms[CDB_MSGLISTS] = gdbm_open("data/msglists.gdbm", 0,
- GDBM_WRCREAT, 0600, NULL);
+ GDBM_WRCREAT, 0600, NULL);
if (gdbms[CDB_MSGLISTS] == NULL) {
lprintf(2, "Cannot open msglists: %s\n",
gdbm_strerror(gdbm_errno));
exit(1);
- }
-
+ }
/*
- end_critical_section(S_DATABASE);
+ end_critical_section(S_DATABASE);
*/
- }
+}
/*
* Close all of the gdbm database files we've opened. This can be done
* in a loop, since it's just a bunch of closes.
*/
-void close_databases(void) {
+void close_databases(void)
+{
int a;
begin_critical_section(S_DATABASE);
- for (a=0; a<MAXCDB; ++a) {
+ for (a = 0; a < MAXCDB; ++a) {
lprintf(7, "Closing database %d\n", a);
gdbm_close(gdbms[a]);
- }
+ }
end_critical_section(S_DATABASE);
- for (a=0; a<max_keys; ++a) {
+ for (a = 0; a < max_keys; ++a) {
if (dtkey[a].dptr != NULL) {
phree(dtkey[a].dptr);
- }
}
-
}
+}
+
/*
* Store a piece of data. Returns 0 if the operation was successful. If a
* datum already exists it should be overwritten.
*/
int cdb_store(int cdb,
- void *key, int keylen,
- void *data, int datalen) {
+ void *key, int keylen,
+ void *data, int datalen)
+{
datum dkey, ddata;
int retval;
ddata.dptr = data;
begin_critical_section(S_DATABASE);
- retval = gdbm_store(gdbms[cdb], dkey, ddata, GDBM_REPLACE);
+ retval = gdbm_store(gdbms[cdb], dkey, ddata, GDBM_REPLACE);
end_critical_section(S_DATABASE);
- if ( retval < 0 ) {
- lprintf(2, "gdbm error: %s\n", gdbm_strerror(gdbm_errno));
- return(-1);
- }
-
- return(0);
+ if (retval < 0) {
+ lprintf(2, "gdbm error: %s\n", gdbm_strerror(gdbm_errno));
+ return (-1);
}
+ return (0);
+}
/*
* Delete a piece of data. Returns 0 if the operation was successful.
*/
-int cdb_delete(int cdb, void *key, int keylen) {
+int cdb_delete(int cdb, void *key, int keylen)
+{
datum dkey;
int retval;
begin_critical_section(S_DATABASE);
retval = gdbm_delete(gdbms[cdb], dkey);
end_critical_section(S_DATABASE);
- return(retval);
+ return (retval);
- }
+}
* a struct cdbdata which it is the caller's responsibility to free later on
* using the cdb_free() routine.
*/
-struct cdbdata *cdb_fetch(int cdb, void *key, int keylen) {
-
+struct cdbdata *cdb_fetch(int cdb, void *key, int keylen)
+{
+
struct cdbdata *tempcdb;
datum dkey, dret;
-
+
dkey.dsize = keylen;
dkey.dptr = key;
end_critical_section(S_DATABASE);
if (dret.dptr == NULL) {
return NULL;
- }
-
+ }
tempcdb = (struct cdbdata *) mallok(sizeof(struct cdbdata));
if (tempcdb == NULL) {
lprintf(2, "Cannot allocate memory!\n");
- }
-
+ }
tempcdb->len = dret.dsize;
tempcdb->ptr = dret.dptr;
- return(tempcdb);
- }
+ return (tempcdb);
+}
/*
* Free a cdbdata item (ok, this is really no big deal, but we might need to do
* more complex stuff with other database managers in the future).
*/
-void cdb_free(struct cdbdata *cdb) {
+void cdb_free(struct cdbdata *cdb)
+{
phree(cdb->ptr);
phree(cdb);
- }
+}
/*
* that is open. There is guaranteed to be no more than one traversal in
* progress per session at any given time.)
*/
-void cdb_rewind(int cdb) {
+void cdb_rewind(int cdb)
+{
while (max_keys <= CC->cs_pid) {
++max_keys;
if (dtkey == NULL) {
dtkey = (datum *)
- mallok( (sizeof(datum) * max_keys) );
- }
- else {
+ mallok((sizeof(datum) * max_keys));
+ } else {
dtkey = (datum *)
- reallok(dtkey, (sizeof(datum) * max_keys) );
+ reallok(dtkey, (sizeof(datum) * max_keys));
}
dtkey[max_keys - 1].dsize = 0;
dtkey[max_keys - 1].dptr = NULL;
if (dtkey[CC->cs_pid].dptr != NULL) {
phree(dtkey[CC->cs_pid].dptr);
- }
-
+ }
begin_critical_section(S_DATABASE);
dtkey[CC->cs_pid] = gdbm_firstkey(gdbms[cdb]);
end_critical_section(S_DATABASE);
- }
+}
/*
* Fetch the next item in a sequential search. Returns a pointer to a
* cdbdata structure, or NULL if we've hit the end.
*/
-struct cdbdata *cdb_next_item(int cdb) {
+struct cdbdata *cdb_next_item(int cdb)
+{
datum dret;
struct cdbdata *cdbret;
+ void *ptr = NULL;
+
-
if (dtkey[CC->cs_pid].dptr == NULL) { /* end of file */
return NULL;
- }
-
+ }
begin_critical_section(S_DATABASE);
dret = gdbm_fetch(gdbms[cdb], dtkey[CC->cs_pid]);
end_critical_section(S_DATABASE);
if (dret.dptr == NULL) { /* bad read */
phree(dtkey[CC->cs_pid].dptr);
return NULL;
- }
-
+ }
cdbret = (struct cdbdata *) mallok(sizeof(struct cdbdata));
cdbret->len = dret.dsize;
cdbret->ptr = dret.dptr;
+ ptr = dtkey[CC->cs_pid].dptr;
begin_critical_section(S_DATABASE);
dtkey[CC->cs_pid] = gdbm_nextkey(gdbms[cdb], dtkey[CC->cs_pid]);
end_critical_section(S_DATABASE);
- return(cdbret);
+
+ if (ptr != NULL) { /* Free the previous key. */
+ free(ptr);
}
+
+ return (cdbret);
+}
projects / citadel.git / commitdiff