summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2013-02-12 20:37:10 (UTC)
committer Michael Krelin <hacker@klever.net>2013-02-12 20:37:10 (UTC)
commit13fb4abba3fd3cac0d5cb25d3eccddc298220d41 (patch) (unidiff)
tree8a086ffef06f153e739674a5c8beab1db9388238
parentb80844f51353339cfbb8b35a5585911cdb4301e2 (diff)
downloadiii-13fb4abba3fd3cac0d5cb25d3eccddc298220d41.zip
iii-13fb4abba3fd3cac0d5cb25d3eccddc298220d41.tar.gz
iii-13fb4abba3fd3cac0d5cb25d3eccddc298220d41.tar.bz2
introduce throwable_exit for nicer stack unwinding
yes, I enjoy abusing features Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--src/eyefiworker.cc4
-rw-r--r--src/eyefiworker.h1
-rw-r--r--src/eyetil.h5
-rw-r--r--src/iiid.cc4
4 files changed, 12 insertions, 2 deletions
diff --git a/src/eyefiworker.cc b/src/eyefiworker.cc
index ac75fc1..1979b46 100644
--- a/src/eyefiworker.cc
+++ b/src/eyefiworker.cc
@@ -31,6 +31,8 @@ eyefiworker::eyefiworker()
31#endif 31#endif
32 ; 32 ;
33 } 33 }
34eyefiworker::~eyefiworker() {
35}
34 36
35int eyefiworker::run(int bindport) { 37int eyefiworker::run(int bindport) {
36#ifdef HAVE_SQLITE 38#ifdef HAVE_SQLITE
@@ -56,7 +58,7 @@ int eyefiworker::run(int bindport) {
56 syslog(LOG_INFO,"maxrss: %ld\n",ru.ru_maxrss); 58 syslog(LOG_INFO,"maxrss: %ld\n",ru.ru_maxrss);
57 } 59 }
58#endif /* NDEBUG */ 60#endif /* NDEBUG */
59 _exit(0); 61 throw throwable_exit(0);
60 } 62 }
61 close(socket); socket = SOAP_INVALID_SOCKET; 63 close(socket); socket = SOAP_INVALID_SOCKET;
62 } 64 }
diff --git a/src/eyefiworker.h b/src/eyefiworker.h
index 6d4082c..6cdecff 100644
--- a/src/eyefiworker.h
+++ b/src/eyefiworker.h
@@ -7,6 +7,7 @@ class eyefiworker : public eyefiService {
7 public: 7 public:
8 8
9 eyefiworker(); 9 eyefiworker();
10 ~eyefiworker();
10 11
11 int run(int port) __attribute__ ((noreturn)); 12 int run(int port) __attribute__ ((noreturn));
12 13
diff --git a/src/eyetil.h b/src/eyetil.h
index eff2c43..03b9ba8 100644
--- a/src/eyetil.h
+++ b/src/eyetil.h
@@ -7,6 +7,11 @@
7#include <archive_entry.h> 7#include <archive_entry.h>
8#include "openssl/md5.h" 8#include "openssl/md5.h"
9 9
10struct throwable_exit {
11 int rc;
12 throwable_exit(int rc_) : rc(rc_) { }
13};
14
10class binary_t : public std::vector<unsigned char> { 15class binary_t : public std::vector<unsigned char> {
11 public: 16 public:
12 binary_t() { } 17 binary_t() { }
diff --git a/src/iiid.cc b/src/iiid.cc
index d655fe3..b3dd3bf 100644
--- a/src/iiid.cc
+++ b/src/iiid.cc
@@ -89,7 +89,9 @@ int main(int argc,char **argv) try {
89 89
90 closelog(); 90 closelog();
91 return 0; 91 return 0;
92} catch(std::exception& e) { 92} catch(const throwable_exit& e) {
93 return e.rc;
94} catch(const std::exception& e) {
93 syslog(LOG_CRIT,"Exiting iii daemon, because of error condition"); 95 syslog(LOG_CRIT,"Exiting iii daemon, because of error condition");
94 syslog(LOG_CRIT,"Exception: %s",e.what()); 96 syslog(LOG_CRIT,"Exception: %s",e.what());
95 return 1; 97 return 1;