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

driver/lcd4linux: rework thread handling

Browse Source 
Use std::thread for simplified handling.

Added bool exit_proc to allow left the thread callback.
Btw. added some temporarily debug outputs to track this behavior.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 33b88ddfed
Author: Thilo Graf <dbt@novatux.de>
Date: 2021-06-11 (Fri, 11 Jun 2021)



------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2021-06-11 21:16:22 +02:00
committed by vanhofen
parent bbb80343ca
commit f3fe5a5682
2 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/driver/lcd4l.cpp
View File

@@ -31,7 +31,7 @@
#include <config.h>
#endif
#include <pthread.h>
#include <sstream>
#include <stdio.h>
#include <unistd.h>
@@ -42,7 +42,7 @@
#include <timerdclient/timerdclient.h>
#include <system/helpers.h>
#include <system/debug.h>
#include <driver/record.h>
#include <driver/audioplay.h>
#include <driver/radiotext.h>
@@ -118,14 +118,17 @@ extern CPictureViewer *g_PicViewer;
CLCD4l::CLCD4l()
{
thrLCD4l = 0;
thrLCD4l = NULL;
exit_proc = false;
}
CLCD4l::~CLCD4l()
{
exit_proc = true;
if (thrLCD4l)
pthread_cancel(thrLCD4l);
thrLCD4l = 0;
thrLCD4l->join();
delete thrLCD4l;
thrLCD4l = NULL;
}
/* ----------------------------------------------------------------- */
@@ -134,7 +137,7 @@ void CLCD4l::InitLCD4l()
{
if (thrLCD4l)
{
printf("[CLCD4l] %s: initializing\n", __FUNCTION__);
dprintf(DEBUG_NORMAL,"\033[32m[CLCD4l] [%s - %d] initializing %d \033[0m\n", __func__, __LINE__);
Init();
}
}
@@ -143,9 +146,11 @@ void CLCD4l::StartLCD4l()
{
if (!thrLCD4l)
{
printf("[CLCD4l] %s: starting thread\n", __FUNCTION__);
pthread_create(&thrLCD4l, NULL, LCD4lProc, (void*) this);
pthread_detach(thrLCD4l);
dprintf(DEBUG_NORMAL,"\033[32m[CLCD4l] [%s - %d] starting thread with mode %d \033[0m\n", __func__, __LINE__, g_settings.lcd4l_support);
exit_proc = false;
thrLCD4l = new std::thread (LCD4lProc, this);
dprintf(DEBUG_NORMAL,"\033[32m[CLCD4l] [%s - %d] thread [%p] is running\033[0m\n", __func__, __LINE__, thrLCD4l);
}
if (g_settings.lcd4l_support)
exec_initscript("lcd4linux", "start");
@@ -155,9 +160,15 @@ void CLCD4l::StopLCD4l()
{
if (thrLCD4l)
{
printf("[CLCD4l] %s: stopping thread\n", __FUNCTION__);
pthread_cancel(thrLCD4l);
thrLCD4l = 0;
dprintf(DEBUG_NORMAL,"\033[32m[CLCD4l] [%s - %d] stopping thread [%p]\033[0m\n", __func__, __LINE__, thrLCD4l);
exit_proc = true;
thrLCD4l->join();
dprintf(DEBUG_NORMAL,"\033[32m[CLCD4l] [%s - %d] thread [%p] joined\033[0m\n", __func__, __LINE__, thrLCD4l);
delete thrLCD4l;
thrLCD4l = NULL;
dprintf(DEBUG_NORMAL,"\033[32m[CLCD4l] [%s - %d] thread [%p] terminated\033[0m\n", __func__, __LINE__, thrLCD4l);
}
exec_initscript("lcd4linux", "stop");
}
@@ -274,9 +285,6 @@ void CLCD4l::Init()
void* CLCD4l::LCD4lProc(void* arg)
{
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, 0);
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, 0);
CLCD4l *PLCD4l = static_cast<CLCD4l*>(arg);
PLCD4l->Init();
@@ -288,7 +296,7 @@ void* CLCD4l::LCD4lProc(void* arg)
bool NewParseID = false;
//printf("[CLCD4l] %s: starting loop\n", __FUNCTION__);
while(1)
while(!PLCD4l->exit_proc)
{
if ( (!access(PIDFILE, F_OK) == 0) && (!FirstRun) )
{