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

Main: use ThreadId instead of GThread*

Browse Source
This commit is contained in:
Max Kellermann 2013-10-17 19:27:02 +02:00
parent aad0ea6e23
commit 32dfc11c23
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Main.cxx
View File

@ -58,6 +58,7 @@
#include "system/FatalError.hxx" #include "system/FatalError.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "thread/Id.hxx"
#include "ConfigGlobal.hxx" #include "ConfigGlobal.hxx"
#include "ConfigData.hxx" #include "ConfigData.hxx"
#include "ConfigDefaults.hxx" #include "ConfigDefaults.hxx"
@ -99,7 +100,7 @@ enum {
static constexpr Domain main_domain("main"); static constexpr Domain main_domain("main");
GThread *main_task; ThreadId main_thread;
EventLoop *main_loop; EventLoop *main_loop;
Instance *instance; Instance *instance;
@ -389,7 +390,7 @@ int mpd_main(int argc, char *argv[])
return EXIT_FAILURE; return EXIT_FAILURE;
} }
main_task = g_thread_self(); main_thread = ThreadId::GetCurrent();
main_loop = new EventLoop(EventLoop::Default()); main_loop = new EventLoop(EventLoop::Default());
instance = new Instance(); instance = new Instance();

4
src/Main.hxx
View File

@ -20,11 +20,11 @@
#ifndef MPD_MAIN_HXX #ifndef MPD_MAIN_HXX
#define MPD_MAIN_HXX #define MPD_MAIN_HXX
class ThreadId;
class EventLoop; class EventLoop;
struct Instance; struct Instance;
typedef struct _GThread GThread;
extern GThread *main_task; extern ThreadId main_thread;
extern EventLoop *main_loop; extern EventLoop *main_loop;

5
src/UpdateGlue.cxx
View File

@ -33,6 +33,7 @@
#include "Main.hxx" #include "Main.hxx"
#include "Instance.hxx" #include "Instance.hxx"
#include "system/FatalError.hxx" #include "system/FatalError.hxx"
#include "thread/Id.hxx"
#include <glib.h> #include <glib.h>
@ -92,7 +93,7 @@ static void * update_task(void *_path)
static void static void
spawn_update_task(const char *path) spawn_update_task(const char *path)
{ {
assert(g_thread_self() == main_task); assert(main_thread.IsInside());
progress = UPDATE_PROGRESS_RUNNING; progress = UPDATE_PROGRESS_RUNNING;
modified = false; modified = false;
@ -115,7 +116,7 @@ spawn_update_task(const char *path)
unsigned unsigned
update_enqueue(const char *path, bool _discard) update_enqueue(const char *path, bool _discard)
{ {
assert(g_thread_self() == main_task); assert(main_thread.IsInside());
if (!db_is_simple() || !mapper_has_music_directory()) if (!db_is_simple() || !mapper_has_music_directory())
return 0; return 0;