extern/encfs
1
0
Fork 0
mirror of https://github.com/vgough/encfs.git synced 2024-11-22 16:03:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes a never ending unmounting case, and log if we still have opened files

Browse Source
This commit is contained in:
benrubson 2016-04-20 16:34:01 +02:00
parent 05a749d32f
commit 01cdc07f95
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
encfs/main.cpp
View File

@ -523,19 +523,6 @@ void *encfs_init(fuse_conn_info *conn) {
} }
void encfs_destroy(void *_ctx) { void encfs_destroy(void *_ctx) {
EncFS_Context *ctx = (EncFS_Context *)_ctx;
if (ctx->args->idleTimeout > 0) {
ctx->running = false;
// wake up the thread if it is waiting..
VLOG(1) << "waking up monitoring thread";
pthread_mutex_lock(&ctx->wakeupMutex);
pthread_cond_signal(&ctx->wakeupCond);
pthread_mutex_unlock(&ctx->wakeupMutex);
VLOG(1) << "joining with idle monitoring thread";
pthread_join(ctx->monitorThread, 0);
VLOG(1) << "join done";
}
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
@ -691,6 +678,18 @@ int main(int argc, char *argv[]) {
} catch (...) { } catch (...) {
RLOG(ERROR) << "Internal error: Caught unexpected exception"; RLOG(ERROR) << "Internal error: Caught unexpected exception";
} }
if (ctx->args->idleTimeout > 0) {
ctx->running = false;
// wake up the thread if it is waiting..
VLOG(1) << "waking up monitoring thread";
pthread_mutex_lock(&ctx->wakeupMutex);
pthread_cond_signal(&ctx->wakeupCond);
pthread_mutex_unlock(&ctx->wakeupMutex);
VLOG(1) << "joining with idle monitoring thread";
pthread_join(ctx->monitorThread, 0);
VLOG(1) << "join done";
}
} }
// cleanup so that we can check for leaked resources.. // cleanup so that we can check for leaked resources..
@ -718,7 +717,7 @@ static void *idleMonitor(void *_arg) {
std::shared_ptr<EncFS_Args> arg = ctx->args; std::shared_ptr<EncFS_Args> arg = ctx->args;
const int timeoutCycles = 60 * arg->idleTimeout / ActivityCheckInterval; const int timeoutCycles = 60 * arg->idleTimeout / ActivityCheckInterval;
int idleCycles = 0; int idleCycles = -1;
pthread_mutex_lock(&ctx->wakeupMutex); pthread_mutex_lock(&ctx->wakeupMutex);
@ -732,13 +731,20 @@ static void *idleMonitor(void *_arg) {
if (idleCycles >= timeoutCycles) { if (idleCycles >= timeoutCycles) {
int openCount = ctx->openFileCount(); int openCount = ctx->openFileCount();
if (openCount == 0 && unmountFS(ctx)) { if (openCount == 0) {
// wait for main thread to wake us up if (unmountFS(ctx)) {
pthread_cond_wait(&ctx->wakeupCond, &ctx->wakeupMutex); // wait for main thread to wake us up
break; pthread_cond_wait(&ctx->wakeupCond, &ctx->wakeupMutex);
break;
}
}
else {
RLOG(WARNING) << "Filesystem "
<< arg->opts->mountPoint
<< " inactivity detected, but still "
<< openCount
<< " opened files";
} }
VLOG(1) << "num open files: " << openCount;
} }
VLOG(1) << "idle cycle count: " << idleCycles << ", timeout after " VLOG(1) << "idle cycle count: " << idleCycles << ", timeout after "