mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 02:11:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	lib/libdvbsub/dvbsub.cpp
	lib/libtuxtxt/tuxtxt.cpp
	src/driver/lcdd.cpp
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 40c7218952
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-12 23:04:09 +01:00
parent 8a8036b8b8 6e85f1b0ca
commit ff7b7dfde7
35 changed files with 111 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/timerd/timerd.cpp
View File

@@ -33,6 +33,7 @@
#include <sectionsdclient/sectionsdclient.h>
#include <connection/basicserver.h>
#include <timerdclient/timerdmsg.h>
#include <system/set_threadname.h>
#include "debug.h"
#include "timermanager.h"
@@ -483,7 +484,7 @@ bool timerd_parse_command(CBasicMessage::Header &rmsg, int connfd)
int timerd_main_thread(void *data)
{
pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, 0);
set_threadname("n:timerd");
printf("timerd startup, tid %ld\n", syscall(__NR_gettid));
CBasicServer timerd_server;

3
src/timerd/timermanager.cpp
View File

@@ -42,7 +42,7 @@
#include "debug.h"
#include "timermanager.h"
#include <system/set_threadname.h>
extern bool timeset;
time_t timer_minutes;
@@ -89,6 +89,7 @@ void* CTimerManager::timerThread(void *arg)
pthread_mutex_t dummy_mutex = PTHREAD_MUTEX_INITIALIZER;
pthread_cond_t dummy_cond = PTHREAD_COND_INITIALIZER;
struct timespec wait;
set_threadname("n:timermanager");
CTimerManager *timerManager = (CTimerManager*) arg;