-
Notifications
You must be signed in to change notification settings - Fork 18.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add signal handler and early exit/snapshot to Solver.
Add signal handler and early exit/snapshot to Solver. Add signal handler and early exit/snapshot to Solver. Also check for exit and snapshot when testing. Skip running test after early exit. Fix more lint. Rebase on master.
- Loading branch information
1 parent
352aef4
commit 17baa33
Showing
6 changed files
with
237 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| #ifndef INCLUDE_CAFFE_UTIL_SIGNAL_HANDLER_H_ | ||
| #define INCLUDE_CAFFE_UTIL_SIGNAL_HANDLER_H_ | ||
|
|
||
| #include "caffe/proto/caffe.pb.h" | ||
| #include "caffe/solver.hpp" | ||
|
|
||
| namespace caffe { | ||
|
|
||
| class SignalHandler { | ||
| public: | ||
| // Contructor. Specify what action to take when a signal is received. | ||
| SignalHandler(SolverParameter_Action SIGINT_action, | ||
| SolverParameter_Action SIGHUP_action); | ||
| ActionCallback GetActionFunction(); | ||
| private: | ||
| SignalHandler(); // Not implemented. | ||
| SolverParameter_Action CheckForSignals() const; | ||
| SolverParameter_Action SIGINT_action_; | ||
| SolverParameter_Action SIGHUP_action_; | ||
| }; | ||
|
|
||
| } // namespace caffe | ||
|
|
||
| #endif // INCLUDE_CAFFE_UTIL_SIGNAL_HANDLER_H_ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| #include <boost/bind.hpp> | ||
| #include <boost/thread/mutex.hpp> | ||
| #include <boost/thread/thread.hpp> | ||
| #include <glog/logging.h> | ||
|
|
||
| #include <signal.h> | ||
| #include <csignal> | ||
|
|
||
| #include "caffe/util/signal_handler.h" | ||
|
|
||
| namespace { | ||
| static volatile sig_atomic_t got_sigint = false; | ||
| static volatile sig_atomic_t got_sighup = false; | ||
| static bool already_hooked_up = false; | ||
|
|
||
| void handle_signal(int signal) { | ||
| switch (signal) { | ||
| case SIGHUP: | ||
| got_sighup = true; | ||
| break; | ||
| case SIGINT: | ||
| got_sigint = true; | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| void HookupHandler() { | ||
| if (already_hooked_up) { | ||
| LOG(FATAL) << "Tried to hookup signal handlers more than once."; | ||
| } | ||
| already_hooked_up = true; | ||
|
|
||
| struct sigaction sa; | ||
| // Setup the sighub handler | ||
| sa.sa_handler = &handle_signal; | ||
| // Restart the system call, if at all possible | ||
| sa.sa_flags = SA_RESTART; | ||
| // Block every signal during the handler | ||
| sigfillset(&sa.sa_mask); | ||
| // Intercept SIGHUP and SIGINT | ||
| if (sigaction(SIGHUP, &sa, NULL) == -1) { | ||
| LOG(FATAL) << "Cannot install SIGHUP handler."; | ||
| } | ||
| if (sigaction(SIGINT, &sa, NULL) == -1) { | ||
| LOG(FATAL) << "Cannot install SIGINT handler."; | ||
| } | ||
| } | ||
|
|
||
| // Return true iff a SIGINT has been received since the last time this | ||
| // function was called. | ||
| bool GotSIGINT() { | ||
| bool result = got_sigint; | ||
| got_sigint = false; | ||
| return result; | ||
| } | ||
|
|
||
| // Return true iff a SIGHUP has been received since the last time this | ||
| // function was called. | ||
| bool GotSIGHUP() { | ||
| bool result = got_sighup; | ||
| got_sighup = false; | ||
| return result; | ||
| } | ||
| } // namespace | ||
|
|
||
| namespace caffe { | ||
|
|
||
| SignalHandler::SignalHandler(SolverParameter_Action SIGINT_action, | ||
| SolverParameter_Action SIGHUP_action): | ||
| SIGINT_action_(SIGINT_action), | ||
| SIGHUP_action_(SIGHUP_action) { | ||
| HookupHandler(); | ||
| } | ||
|
|
||
| SolverParameter_Action SignalHandler::CheckForSignals() const { | ||
| if (GotSIGHUP()) { | ||
| return SIGHUP_action_; | ||
| } | ||
| if (GotSIGINT()) { | ||
| return SIGINT_action_; | ||
| } | ||
| return SolverParameter_Action_NONE; | ||
| } | ||
|
|
||
| // Return the function that the solver can use to find out if a snapshot or | ||
| // early exit is being requested. | ||
| ActionCallback SignalHandler::GetActionFunction() { | ||
| return boost::bind(&SignalHandler::CheckForSignals, this); | ||
| } | ||
|
|
||
| } // namespace caffe |
Oops, something went wrong.