oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Instance: rename Shutdown() to Break()

This commit is contained in:
Max Kellermann 2018-01-29 23:31:41 +01:00
parent b6013a92e0
commit befd669075
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Instance.hxx
View File

@ -97,9 +97,9 @@ struct Instance final
~Instance() noexcept; ~Instance() noexcept;
/** /**
* Initiate shutdown. Wrapper for EventLoop::Break(). * Wrapper for EventLoop::Break(). Call to initiate shutdown.
*/ */
void Shutdown() { void Break() {
event_loop.Break(); event_loop.Break();
} }

2
src/Main.cxx
View File

@ -747,7 +747,7 @@ JNIEXPORT void JNICALL
Java_org_musicpd_Bridge_shutdown(JNIEnv *, jclass) Java_org_musicpd_Bridge_shutdown(JNIEnv *, jclass)
{ {
if (instance != nullptr) if (instance != nullptr)
instance->Shutdown(); instance->Break();
} }
#endif #endif

2
src/client/ClientRead.cxx
View File

@ -52,7 +52,7 @@ Client::OnSocketInput(void *data, size_t length) noexcept
break; break;
case CommandResult::KILL: case CommandResult::KILL:
partition->instance.Shutdown(); partition->instance.Break();
Close(); Close();
return InputResult::CLOSED; return InputResult::CLOSED;

4
src/win32/Win32Main.cxx
View File

@ -71,7 +71,7 @@ service_dispatcher(gcc_unused DWORD control, gcc_unused DWORD event_type,
switch (control) { switch (control) {
case SERVICE_CONTROL_SHUTDOWN: case SERVICE_CONTROL_SHUTDOWN:
case SERVICE_CONTROL_STOP: case SERVICE_CONTROL_STOP:
instance->Shutdown(); instance->Break();
return NO_ERROR; return NO_ERROR;
default: default:
return NO_ERROR; return NO_ERROR;
@ -107,7 +107,7 @@ console_handler(DWORD event)
// regardless our thread is still active. // regardless our thread is still active.
// If this did not happen within 3 seconds // If this did not happen within 3 seconds
// let's shutdown anyway. // let's shutdown anyway.
instance->Shutdown(); instance->Break();
// Under debugger it's better to wait indefinitely // Under debugger it's better to wait indefinitely
// to allow debugging of shutdown code. // to allow debugging of shutdown code.
Sleep(IsDebuggerPresent() ? INFINITE : 3000); Sleep(IsDebuggerPresent() ? INFINITE : 3000);