greg/stasis-aries-wal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dirtyPages_deinit was broken. (Was excercised by new pageArray bufferManager...)

Browse source
This commit is contained in:
Sears Russell 2007-03-04 02:44:19 +00:00
parent 5650953c4f
commit e49e8c004e
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/lladd/truncation.c
View file

@ -5,7 +5,7 @@
#include "page.h" #include "page.h"
#include <assert.h> #include <assert.h>
static volatile int initialized = 0; static int initialized = 0;
static int automaticallyTuncating = 0; static int automaticallyTuncating = 0;
static pthread_t truncationThread; static pthread_t truncationThread;
@ -111,8 +111,13 @@ void dirtyPagesInit() {
void dirtyPagesDeinit() { void dirtyPagesDeinit() {
void * tmp; void * tmp;
int areDirty = 0;
for(tmp = pblHtFirst(dirtyPages); tmp; tmp = pblHtNext(dirtyPages)) { for(tmp = pblHtFirst(dirtyPages); tmp; tmp = pblHtNext(dirtyPages)) {
free(pblHtCurrentKey(dirtyPages)); free(pblHtCurrent(dirtyPages));
if(!areDirty) {
printf("Warning: dirtyPagesDeinit detected dirty, unwritten pages. Updates lost?\n");
areDirty = 1;
}
} }
pblHtDelete(dirtyPages); pblHtDelete(dirtyPages);
dirtyPages = 0; dirtyPages = 0;
@ -122,11 +127,15 @@ void truncationInit() {
} }
void truncationDeinit() { void truncationDeinit() {
pthread_mutex_lock(&shutdown_mutex);
initialized = 0; initialized = 0;
if(automaticallyTuncating) { if(automaticallyTuncating) {
void * ret = 0; void * ret = 0;
pthread_mutex_unlock(&shutdown_mutex);
pthread_cond_broadcast(&shutdown_cond); pthread_cond_broadcast(&shutdown_cond);
pthread_join(truncationThread, &ret); pthread_join(truncationThread, &ret);
} else {
pthread_mutex_unlock(&shutdown_mutex);
} }
automaticallyTuncating = 0; automaticallyTuncating = 0;
} }