introduce throwable_exit for nicer stack unwinding

yes, I enjoy abusing features

Signed-off-by: Michael Krelin <hacker@klever.net>

1 files changed, 3 insertions, 1 deletions

diff --git a/src/eyefiworker.cc b/src/eyefiworker.cc
index ac75fc1..1979b46 100644
--- a/src/eyefiworker.cc
+++ b/src/eyefiworker.cc
@@ -2,90 +2,92 @@
 #ifndef NDEBUG
 # include <sys/resource.h>
 #endif
 #include <syslog.h>
 #include <cassert>
 #include <iostream>
 #include <fstream>
 #include <stdexcept>
 #include <iterator>
 #include <algorithm>
 #include <sys/wait.h>
 #include <autosprintf.h>
 #include "eyekinfig.h"
 #include "eyetil.h"
 #include "eyefiworker.h"
 #ifdef HAVE_SQLITE
 # include "iiidb.h"
 #endif
 
 eyefiworker::eyefiworker()
     : eyefiService(SOAP_IO_STORE|SOAP_IO_KEEPALIVE) {
 	bind_flags = SO_REUSEADDR; max_keep_alive = 0;
 	socket_flags =
 #if defined(MSG_NOSIGNAL)
 	    MSG_NOSIGNAL
 #elif defined(SO_NOSIGPIPE)
 	    SO_NOSIGPIPE
 #else
 #error Something is wrong with sigpipe prevention on the platform
 #endif
 	    ;
     }
+eyefiworker::~eyefiworker() {
+}
 
 int eyefiworker::run(int bindport) {
 #ifdef HAVE_SQLITE
     sqlite3_initialize();
 #endif
     if(!soap_valid_socket(bind(0,bindport,64)))
 	throw std::runtime_error("failed to bind()");
     signal(SIGCHLD,SIG_IGN);
     while(true) {
 	if(!soap_valid_socket(accept()))
 	    throw std::runtime_error("failed to accept()");
 	pid_t p = fork();
 	if(p<0) throw std::runtime_error("failed to fork()");
 	if(!p) {
 	    recv_timeout = 600; send_timeout = 120;
 	    (void)serve();
 	    soap_destroy(this); soap_end(this); soap_done(this);
 #ifndef NDEBUG
 	    struct rusage ru;
 	    if(getrusage(RUSAGE_SELF,&ru)) {
 		syslog(LOG_NOTICE,"Failed to getrusage(): %d",errno);
 	    }else{
 		syslog(LOG_INFO,"maxrss: %ld\n",ru.ru_maxrss);
 	    }
 #endif /* NDEBUG */
-	    _exit(0);
+	    throw throwable_exit(0);
 	}
 	close(socket); socket = SOAP_INVALID_SOCKET;
     }
 }
 
 static binary_t session_nonce;
 #ifdef HAVE_SQLITE
     static struct {
 	std::string filesignature;
 	long filesize;
 	std::string filename;
 	inline void reset() { filesignature.erase(); filename.erase(); filesize=0; }
 	inline void set(const std::string n,const std::string sig,long siz) {
 	    filename = n; filesignature = sig; filesize = siz;
 	}
 	inline bool is(const std::string n,const std::string sig,long siz) {
 	    return filesize==siz && filename==n && filesignature==sig;
 	}
     }   already;
 #endif /* HAVE_SQLITE */
 
 static bool detached_child() {
     pid_t p = fork();
     if(p<0) {
 	syslog(LOG_ERR,"Failed to fork away for hook execution");
 	_exit(-1);
     }
     if(!p) {
 	setsid();
 	for(int i=getdtablesize();i>=0;--i) close(i);
 	int i=open("/dev/null",O_RDWR); assert(i==0);
 	i = dup(i); assert(i==1);