atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

begin of the remove of the multiple thread in the openGl display system

Browse Source
This commit is contained in:
Edouard DUPIN 2012-08-10 14:11:00 +02:00
parent 74a4ca9e84
commit de3cff6ad5
7 changed files with 86 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/libewol/ewol/Widget.h
View File

@ -27,7 +27,7 @@
#include <ewol/EObject.h>
#define NB_BOUBLE_BUFFER (2)
#define NB_BOUBLE_BUFFER (1)
namespace ewol {
class Widget;

111
Sources/libewol/ewol/base/MainThread.cpp
View File

@ -90,29 +90,17 @@ void EWOL_NativeRegenerateDisplay(void);
extern eventSpecialKey_ts specialCurrentKey;
static void* BaseAppEntry(void* param)
static bool requestEndProcessing = false;
void ewolProcessInit(void)
{
bool requestEndProcessing = false;
requestEndProcessing = false;
EWOL_DEBUG("==> Init BThread (START)");
EWOL_INFO("v" EWOL_VERSION_TAG_NAME);
EWOL_INFO("Build Date: " BUILD_TIME);
etk::InitDefaultFolder("ewolApplNoName");
/*
struct sched_param pr;
int ret = 9;
int policy;
pthread_getschedparam(pthread_self(), &policy, &pr);
EWOL_INFO("Child Thread Up PL" << policy << " PRI" << pr.sched_priority); //The result here
policy = SCHED_RR;
pr.sched_priority = 19;
pthread_setschedparam(pthread_self(), policy, &pr);
sleep(1);
pthread_getschedparam(pthread_self(), &policy, &pr);
EWOL_INFO("Child Thread Up PL" << policy << " PRI" << pr.sched_priority); //The result Set
*/
ewol::EObjectManager::Init();
ewol::EObjectMessageMultiCast::Init();
@ -122,13 +110,20 @@ static void* BaseAppEntry(void* param)
ewol::InitFont();
ewol::shortCut::Init();
APP_Init();
int32_t countNbEvent = 0;
EWOL_DEBUG("==> Init BThread (END)");
while(false == requestEndProcessing) {
ewol::threadMsg::threadMsgContent_ts data;
data.type = THREAD_JUST_DISPLAY;
}
void ewolProcessEvents(void)
{
int32_t nbEvent = 0;
//EWOL_DEBUG(" ******** Event");
ewol::threadMsg::threadMsgContent_ts data;
data.type = THREAD_JUST_DISPLAY;
while (ewol::threadMsg::WaitingMessage(androidJniMsg)>0)
{
nbEvent++;
ewol::threadMsg::WaitMessage(androidJniMsg, data);
countNbEvent++;
if (data.type != THREAD_JUST_DISPLAY) {
//EWOL_DEBUG("EVENT");
switch (data.type) {
@ -202,17 +197,25 @@ static void* BaseAppEntry(void* param)
break;
}
}
if (0 == ewol::threadMsg::WaitingMessage(androidJniMsg)) {
if (countNbEvent > 0) {
if(true == ewol::threadMsg::HasDisplayDone(androidJniMsg)) {
int64_t localTime = GetCurrentTime();
ewol::widgetManager::PeriodicCall(localTime);
}
EWOL_NativeRegenerateDisplay();
countNbEvent = 0;
}
}
}
// pb here when dynamic widget ...
if (0 < nbEvent) {
ewolProcessRedraw();
}
}
void ewolProcessRedraw(void)
{
//EWOL_DEBUG(" ******** Redraw");
if(true == ewol::threadMsg::HasDisplayDone(androidJniMsg)) {
int64_t localTime = GetCurrentTime();
ewol::widgetManager::PeriodicCall(localTime);
}
EWOL_NativeRegenerateDisplay();
}
void ewolProcessUnInit(void)
{
EWOL_DEBUG("==> Un-Init BThread (START)");
// unset all windows
@ -228,6 +231,17 @@ static void* BaseAppEntry(void* param)
ewol::EObjectManager::UnInit();
ewol::eventInput::UnInit();
EWOL_DEBUG("==> Un-Init BThread (END)");
}
static void* BaseAppEntry(void* param)
{
ewolProcessInit();
while(false == requestEndProcessing) {
ewolProcessEvents();
}
ewolProcessUnInit();
pthread_exit(NULL);
}
@ -263,18 +277,22 @@ bool isGlobalSystemInit = false;
void EWOL_SystemStart(void)
{
if (false == isGlobalSystemInit) {
// create interface mutex :
// create message system ...
EWOL_DEBUG("Init thread message system");
ewol::threadMsg::Init(androidJniMsg);
// init the thread :
EWOL_DEBUG("Create the thread");
pthread_attr_init(&androidJniThreadAttr);
pthread_attr_setdetachstate(&androidJniThreadAttr, PTHREAD_CREATE_JOINABLE);
//pthread_attr_setdetachstate(&androidJniThreadAttr, PTHREAD_CREATE_DETACHED);
//pthread_attr_setscope( &androidJniThreadAttr, PTHREAD_SCOPE_SYSTEM);
pthread_setname_np(androidJniThread, "ewol_basic_thread");
pthread_create(&androidJniThread, &androidJniThreadAttr, BaseAppEntry, NULL);
//pthread_create(&androidJniThread, NULL, BaseAppEntry, NULL);
#ifdef MODE_MULTY_THREAD
// init the thread :
EWOL_DEBUG("Create the thread");
pthread_attr_init(&androidJniThreadAttr);
pthread_attr_setdetachstate(&androidJniThreadAttr, PTHREAD_CREATE_JOINABLE);
//pthread_attr_setdetachstate(&androidJniThreadAttr, PTHREAD_CREATE_DETACHED);
//pthread_attr_setscope( &androidJniThreadAttr, PTHREAD_SCOPE_SYSTEM);
pthread_setname_np(androidJniThread, "ewol_basic_thread");
pthread_create(&androidJniThread, &androidJniThreadAttr, BaseAppEntry, NULL);
//pthread_create(&androidJniThread, NULL, BaseAppEntry, NULL);
#else
ewolProcessInit();
#endif
isGlobalSystemInit = true;
EWOL_DEBUG("Send Init message to the thread");
ewol::threadMsg::SendMessage(androidJniMsg, THREAD_INIT, ewol::threadMsg::MSG_PRIO_REAL_TIME);
@ -288,10 +306,13 @@ void EWOL_SystemStop(void)
if (true == isGlobalSystemInit) {
isGlobalSystemInit = false;
ewol::threadMsg::SendMessage(androidJniMsg, THREAD_UN_INIT, ewol::threadMsg::MSG_PRIO_REAL_TIME);
EWOL_DEBUG("Wait end of the thread ...");
// Wait end of the thread
pthread_join(androidJniThread, NULL);
#ifdef MODE_MULTY_THREAD
EWOL_DEBUG("Wait end of the thread ...");
// Wait end of the thread
pthread_join(androidJniThread, NULL);
#else
ewolProcessUnInit();
#endif
ewol::threadMsg::UnInit(androidJniMsg);
}
}

4
Sources/libewol/ewol/base/MainThread.h
View File

@ -29,9 +29,13 @@
#include <pthread.h>
//#define MODE_MULTY_THREAD
void EWOL_SystemStart(void);
void EWOL_SystemStop(void);
void ewolProcessEvents(void);
void ewolProcessRedraw(void);
void EWOL_ThreadSetArchiveDir(int mode, const char* str);
void EWOL_ThreadResize(int w, int h );

5
Sources/libewol/ewol/base/guiX11.cpp
View File

@ -1065,6 +1065,11 @@ void X11_Run(void)
}
}
if(true == m_run) {
#ifdef MODE_MULTY_THREAD
#else
ewolProcessEvents();
#endif
#ifdef DEBUG_X11_EVENT
EWOL_INFO("X11 Render...");
#endif

8
Sources/libewol/ewol/threadMsg.cpp
View File

@ -180,6 +180,14 @@ int32_t ewol::threadMsg::WaitingMessage(threadMsg_ts& messageData)
return nbMessage;
}
bool ewol::threadMsg::HaveMessage(threadMsg_ts& messageData)
{
if (0 < WaitingMessage(messageData)) {
return true;
}
return false;
}
void ewol::threadMsg::SendDisplayDone(threadMsg_ts& messageData)
{
if (false == messageData.isInit) {

1
Sources/libewol/ewol/threadMsg.h
View File

@ -63,6 +63,7 @@ namespace ewol {
void UnInit(threadMsg_ts& messageData);
bool WaitMessage(threadMsg_ts& messageData, threadMsgContent_ts &data);
int32_t WaitingMessage(threadMsg_ts& messageData);
bool HaveMessage(threadMsg_ts& messageData);
bool SendMessage(threadMsg_ts& messageData, uint32_t type, msgPriority_te prio = MSG_PRIO_NONE, void * data = NULL, uint32_t size = 0);
void SendDisplayDone(threadMsg_ts& messageData);
bool HasDisplayDone(threadMsg_ts& messageData);

2
Sources/libpng

@ -1 +1 @@
Subproject commit c99fd7ab48b54fcec32a0dceca43169e6cc2254d
Subproject commit 99e6413c795826d718199b174eec6e79bb7fc8de