mirror of
https://github.com/rhasspy/espeak-ng.git
synced 2026-11-11 08:30:31 +00:00
Fix indentation.
git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@24 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
+419
-419
@@ -108,34 +108,34 @@ void event_init(t_espeak_callback* SynthCallback)
|
||||
//<event_display
|
||||
void event_display(espeak_EVENT* event)
|
||||
{
|
||||
ENTER("event_display");
|
||||
ENTER("event_display");
|
||||
|
||||
#ifdef DEBUG_ENABLED
|
||||
if (event==NULL)
|
||||
{
|
||||
SHOW("event_display > event=%s\n","NULL");
|
||||
}
|
||||
else
|
||||
{
|
||||
static const char* label[] = {
|
||||
"LIST_TERMINATED",
|
||||
"WORD",
|
||||
"SENTENCE",
|
||||
"MARK",
|
||||
"PLAY",
|
||||
"END",
|
||||
"MSG_TERMINATED"
|
||||
};
|
||||
if (event==NULL)
|
||||
{
|
||||
SHOW("event_display > event=%s\n","NULL");
|
||||
}
|
||||
else
|
||||
{
|
||||
static const char* label[] = {
|
||||
"LIST_TERMINATED",
|
||||
"WORD",
|
||||
"SENTENCE",
|
||||
"MARK",
|
||||
"PLAY",
|
||||
"END",
|
||||
"MSG_TERMINATED"
|
||||
};
|
||||
|
||||
SHOW("event_display > event=0x%x\n",event);
|
||||
SHOW("event_display > type=%s\n",label[event->type]);
|
||||
SHOW("event_display > uid=%d\n",event->unique_identifier);
|
||||
SHOW("event_display > text_position=%d\n",event->text_position);
|
||||
SHOW("event_display > length=%d\n",event->length);
|
||||
SHOW("event_display > audio_position=%d\n",event->audio_position);
|
||||
SHOW("event_display > sample=%d\n",event->sample);
|
||||
SHOW("event_display > user_data=0x%x\n",event->user_data);
|
||||
}
|
||||
SHOW("event_display > event=0x%x\n",event);
|
||||
SHOW("event_display > type=%s\n",label[event->type]);
|
||||
SHOW("event_display > uid=%d\n",event->unique_identifier);
|
||||
SHOW("event_display > text_position=%d\n",event->text_position);
|
||||
SHOW("event_display > length=%d\n",event->length);
|
||||
SHOW("event_display > audio_position=%d\n",event->audio_position);
|
||||
SHOW("event_display > sample=%d\n",event->sample);
|
||||
SHOW("event_display > user_data=0x%x\n",event->user_data);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
//>
|
||||
@@ -143,36 +143,36 @@ void event_display(espeak_EVENT* event)
|
||||
|
||||
static espeak_EVENT* event_copy (espeak_EVENT* event)
|
||||
{
|
||||
ENTER("event_copy");
|
||||
|
||||
if (event==NULL)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
espeak_EVENT* a_event=(espeak_EVENT*)malloc(sizeof(espeak_EVENT));
|
||||
if (a_event)
|
||||
{
|
||||
memcpy(a_event, event, sizeof(espeak_EVENT));
|
||||
|
||||
switch(event->type)
|
||||
ENTER("event_copy");
|
||||
|
||||
if (event==NULL)
|
||||
{
|
||||
case espeakEVENT_MARK:
|
||||
case espeakEVENT_PLAY:
|
||||
if (event->id.name)
|
||||
{
|
||||
a_event->id.name = strdup(event->id.name);
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
event_display(a_event);
|
||||
|
||||
return a_event;
|
||||
|
||||
espeak_EVENT* a_event=(espeak_EVENT*)malloc(sizeof(espeak_EVENT));
|
||||
if (a_event)
|
||||
{
|
||||
memcpy(a_event, event, sizeof(espeak_EVENT));
|
||||
|
||||
switch(event->type)
|
||||
{
|
||||
case espeakEVENT_MARK:
|
||||
case espeakEVENT_PLAY:
|
||||
if (event->id.name)
|
||||
{
|
||||
a_event->id.name = strdup(event->id.name);
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
event_display(a_event);
|
||||
|
||||
return a_event;
|
||||
}
|
||||
|
||||
//>
|
||||
@@ -189,81 +189,80 @@ static espeak_EVENT* event_copy (espeak_EVENT* event)
|
||||
|
||||
static void event_notify(espeak_EVENT* event)
|
||||
{
|
||||
ENTER("event_notify");
|
||||
ENTER("event_notify");
|
||||
|
||||
static unsigned int a_old_uid = 0;
|
||||
static unsigned int a_old_uid = 0;
|
||||
|
||||
if (event && my_callback)
|
||||
{
|
||||
event_display(event);
|
||||
|
||||
switch(event->type)
|
||||
if (event && my_callback)
|
||||
{
|
||||
case espeakEVENT_SENTENCE:
|
||||
my_callback(NULL, 0, event);
|
||||
a_old_uid = event->unique_identifier;
|
||||
break;
|
||||
event_display(event);
|
||||
|
||||
case espeakEVENT_WORD:
|
||||
case espeakEVENT_MSG_TERMINATED:
|
||||
{
|
||||
if (a_old_uid != event->unique_identifier)
|
||||
{
|
||||
espeak_EVENT_TYPE a_new_type = event->type;
|
||||
event->type = espeakEVENT_SENTENCE;
|
||||
my_callback(NULL, 0, event);
|
||||
event->type = a_new_type;
|
||||
usleep(50000);
|
||||
}
|
||||
my_callback(NULL, 0, event);
|
||||
a_old_uid = event->unique_identifier;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
case espeakEVENT_LIST_TERMINATED:
|
||||
case espeakEVENT_MARK:
|
||||
case espeakEVENT_PLAY:
|
||||
case espeakEVENT_END:
|
||||
break;
|
||||
switch(event->type)
|
||||
{
|
||||
case espeakEVENT_SENTENCE:
|
||||
my_callback(NULL, 0, event);
|
||||
a_old_uid = event->unique_identifier;
|
||||
break;
|
||||
|
||||
case espeakEVENT_WORD:
|
||||
case espeakEVENT_MSG_TERMINATED:
|
||||
{
|
||||
if (a_old_uid != event->unique_identifier)
|
||||
{
|
||||
espeak_EVENT_TYPE a_new_type = event->type;
|
||||
event->type = espeakEVENT_SENTENCE;
|
||||
my_callback(NULL, 0, event);
|
||||
event->type = a_new_type;
|
||||
usleep(50000);
|
||||
}
|
||||
my_callback(NULL, 0, event);
|
||||
a_old_uid = event->unique_identifier;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
case espeakEVENT_LIST_TERMINATED:
|
||||
case espeakEVENT_MARK:
|
||||
case espeakEVENT_PLAY:
|
||||
case espeakEVENT_END:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//>
|
||||
//<event_delete
|
||||
|
||||
static int event_delete(espeak_EVENT* event)
|
||||
{
|
||||
ENTER("event_delete");
|
||||
ENTER("event_delete");
|
||||
|
||||
event_display(event);
|
||||
event_display(event);
|
||||
|
||||
if(event==NULL)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
switch(event->type)
|
||||
{
|
||||
case espeakEVENT_MSG_TERMINATED:
|
||||
event_notify(event);
|
||||
break;
|
||||
|
||||
case espeakEVENT_MARK:
|
||||
case espeakEVENT_PLAY:
|
||||
if(event->id.name)
|
||||
if(event==NULL)
|
||||
{
|
||||
free((void*)(event->id.name));
|
||||
return 0;
|
||||
}
|
||||
|
||||
break;
|
||||
switch(event->type)
|
||||
{
|
||||
case espeakEVENT_MSG_TERMINATED:
|
||||
event_notify(event);
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
case espeakEVENT_MARK:
|
||||
case espeakEVENT_PLAY:
|
||||
if(event->id.name)
|
||||
{
|
||||
free((void*)(event->id.name));
|
||||
}
|
||||
break;
|
||||
|
||||
free(event);
|
||||
return 1;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
free(event);
|
||||
return 1;
|
||||
}
|
||||
|
||||
//>
|
||||
@@ -271,41 +270,41 @@ static int event_delete(espeak_EVENT* event)
|
||||
|
||||
espeak_ERROR event_declare (espeak_EVENT* event)
|
||||
{
|
||||
ENTER("event_declare");
|
||||
ENTER("event_declare");
|
||||
|
||||
event_display(event);
|
||||
event_display(event);
|
||||
|
||||
if (!event)
|
||||
{
|
||||
return EE_INTERNAL_ERROR;
|
||||
}
|
||||
|
||||
int a_status = pthread_mutex_lock(&my_mutex);
|
||||
espeak_ERROR a_error = EE_OK;
|
||||
|
||||
if (!a_status)
|
||||
{
|
||||
SHOW_TIME("event_declare > locked\n");
|
||||
espeak_EVENT* a_event = event_copy(event);
|
||||
a_error = push(a_event);
|
||||
if (a_error != EE_OK)
|
||||
if (!event)
|
||||
{
|
||||
event_delete(a_event);
|
||||
return EE_INTERNAL_ERROR;
|
||||
}
|
||||
|
||||
int a_status = pthread_mutex_lock(&my_mutex);
|
||||
espeak_ERROR a_error = EE_OK;
|
||||
|
||||
if (!a_status)
|
||||
{
|
||||
SHOW_TIME("event_declare > locked\n");
|
||||
espeak_EVENT* a_event = event_copy(event);
|
||||
a_error = push(a_event);
|
||||
if (a_error != EE_OK)
|
||||
{
|
||||
event_delete(a_event);
|
||||
}
|
||||
SHOW_TIME("event_declare > unlocking\n");
|
||||
a_status = pthread_mutex_unlock(&my_mutex);
|
||||
}
|
||||
SHOW_TIME("event_declare > unlocking\n");
|
||||
a_status = pthread_mutex_unlock(&my_mutex);
|
||||
}
|
||||
|
||||
// TBD: remove the comment
|
||||
// reminder: code in comment.
|
||||
// This wait can lead to an underrun
|
||||
//
|
||||
// if (!a_status && !my_event_is_running && (a_error == EE_OK))
|
||||
// {
|
||||
// {
|
||||
// // quit when command is actually started
|
||||
// // (for possible forthcoming 'end of command' checks)
|
||||
SHOW_TIME("event_declare > post my_sem_start_is_required\n");
|
||||
sem_post(&my_sem_start_is_required);
|
||||
SHOW_TIME("event_declare > post my_sem_start_is_required\n");
|
||||
sem_post(&my_sem_start_is_required);
|
||||
// int val=1;
|
||||
// while (val)
|
||||
// {
|
||||
@@ -314,12 +313,12 @@ espeak_ERROR event_declare (espeak_EVENT* event)
|
||||
// }
|
||||
// }
|
||||
|
||||
if (a_status != 0)
|
||||
{
|
||||
a_error = EE_INTERNAL_ERROR;
|
||||
}
|
||||
if (a_status != 0)
|
||||
{
|
||||
a_error = EE_INTERNAL_ERROR;
|
||||
}
|
||||
|
||||
return a_error;
|
||||
return a_error;
|
||||
}
|
||||
|
||||
//>
|
||||
@@ -327,47 +326,47 @@ espeak_ERROR event_declare (espeak_EVENT* event)
|
||||
|
||||
espeak_ERROR event_clear_all ()
|
||||
{
|
||||
ENTER("event_clear_all");
|
||||
ENTER("event_clear_all");
|
||||
|
||||
int a_status = pthread_mutex_lock(&my_mutex);
|
||||
int a_event_is_running = 0;
|
||||
int a_status = pthread_mutex_lock(&my_mutex);
|
||||
int a_event_is_running = 0;
|
||||
|
||||
SHOW_TIME("event_stop > locked\n");
|
||||
if (a_status != 0)
|
||||
{
|
||||
return EE_INTERNAL_ERROR;
|
||||
}
|
||||
|
||||
if (my_event_is_running)
|
||||
{
|
||||
SHOW_TIME("event_stop > post my_sem_stop_is_required\n");
|
||||
sem_post(&my_sem_stop_is_required);
|
||||
a_event_is_running = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
init(); // clear pending events
|
||||
}
|
||||
SHOW_TIME("event_stop > unlocking\n");
|
||||
a_status = pthread_mutex_unlock(&my_mutex);
|
||||
if (a_status != 0)
|
||||
{
|
||||
return EE_INTERNAL_ERROR;
|
||||
}
|
||||
|
||||
if (a_event_is_running)
|
||||
{
|
||||
SHOW_TIME("event_stop > wait for my_sem_stop_is_acknowledged\n");
|
||||
while ((sem_wait(&my_sem_stop_is_acknowledged) == -1) && errno == EINTR)
|
||||
SHOW_TIME("event_stop > locked\n");
|
||||
if (a_status != 0)
|
||||
{
|
||||
continue; // Restart when interrupted by handler
|
||||
return EE_INTERNAL_ERROR;
|
||||
}
|
||||
SHOW_TIME("event_stop > get my_sem_stop_is_acknowledged\n");
|
||||
}
|
||||
|
||||
SHOW_TIME("LEAVE event_stop\n");
|
||||
if (my_event_is_running)
|
||||
{
|
||||
SHOW_TIME("event_stop > post my_sem_stop_is_required\n");
|
||||
sem_post(&my_sem_stop_is_required);
|
||||
a_event_is_running = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
init(); // clear pending events
|
||||
}
|
||||
SHOW_TIME("event_stop > unlocking\n");
|
||||
a_status = pthread_mutex_unlock(&my_mutex);
|
||||
if (a_status != 0)
|
||||
{
|
||||
return EE_INTERNAL_ERROR;
|
||||
}
|
||||
|
||||
return EE_OK;
|
||||
if (a_event_is_running)
|
||||
{
|
||||
SHOW_TIME("event_stop > wait for my_sem_stop_is_acknowledged\n");
|
||||
while ((sem_wait(&my_sem_stop_is_acknowledged) == -1) && errno == EINTR)
|
||||
{
|
||||
continue; // Restart when interrupted by handler
|
||||
}
|
||||
SHOW_TIME("event_stop > get my_sem_stop_is_acknowledged\n");
|
||||
}
|
||||
|
||||
SHOW_TIME("LEAVE event_stop\n");
|
||||
|
||||
return EE_OK;
|
||||
}
|
||||
|
||||
//>
|
||||
@@ -375,39 +374,39 @@ espeak_ERROR event_clear_all ()
|
||||
|
||||
static int sleep_until_timeout_or_stop_request(uint32_t time_in_ms)
|
||||
{
|
||||
ENTER("sleep_until_timeout_or_stop_request");
|
||||
ENTER("sleep_until_timeout_or_stop_request");
|
||||
|
||||
int a_stop_is_required=0;
|
||||
struct timespec ts, to;
|
||||
struct timeval tv;
|
||||
int err=0;
|
||||
int a_stop_is_required=0;
|
||||
struct timespec ts, to;
|
||||
struct timeval tv;
|
||||
int err=0;
|
||||
|
||||
clock_gettime2( &ts);
|
||||
to.tv_sec = ts.tv_sec;
|
||||
to.tv_nsec = ts.tv_nsec;
|
||||
|
||||
add_time_in_ms( &ts, time_in_ms);
|
||||
|
||||
SHOW("polling_thread > sleep_until_timeout_or_stop_request > start sem_timedwait from %d.%09lu to %d.%09lu \n",
|
||||
clock_gettime2( &ts);
|
||||
to.tv_sec = ts.tv_sec;
|
||||
to.tv_nsec = ts.tv_nsec;
|
||||
|
||||
add_time_in_ms( &ts, time_in_ms);
|
||||
|
||||
SHOW("polling_thread > sleep_until_timeout_or_stop_request > start sem_timedwait from %d.%09lu to %d.%09lu \n",
|
||||
to.tv_sec, to.tv_nsec,
|
||||
ts.tv_sec, ts.tv_nsec);
|
||||
|
||||
while ((err = sem_timedwait(&my_sem_stop_is_required, &ts)) == -1
|
||||
&& errno == EINTR)
|
||||
{
|
||||
continue; // Restart when interrupted by handler
|
||||
}
|
||||
while ((err = sem_timedwait(&my_sem_stop_is_required, &ts)) == -1
|
||||
&& errno == EINTR)
|
||||
{
|
||||
continue; // Restart when interrupted by handler
|
||||
}
|
||||
|
||||
assert (gettimeofday(&tv, NULL) != -1);
|
||||
SHOW("polling_thread > sleep_until_timeout_or_stop_request > stop sem_timedwait %d.%09lu \n",
|
||||
assert (gettimeofday(&tv, NULL) != -1);
|
||||
SHOW("polling_thread > sleep_until_timeout_or_stop_request > stop sem_timedwait %d.%09lu \n",
|
||||
tv.tv_sec, tv.tv_usec*1000);
|
||||
|
||||
if (err == 0)
|
||||
{
|
||||
SHOW("polling_thread > sleep_until_timeout_or_stop_request > %s\n","stop required!");
|
||||
a_stop_is_required=1; // stop required
|
||||
}
|
||||
return a_stop_is_required;
|
||||
if (err == 0)
|
||||
{
|
||||
SHOW("polling_thread > sleep_until_timeout_or_stop_request > %s\n","stop required!");
|
||||
a_stop_is_required=1; // stop required
|
||||
}
|
||||
return a_stop_is_required;
|
||||
}
|
||||
|
||||
//>
|
||||
@@ -418,21 +417,21 @@ static int sleep_until_timeout_or_stop_request(uint32_t time_in_ms)
|
||||
|
||||
static int get_remaining_time(uint32_t sample, uint32_t* time_in_ms, int* stop_is_required)
|
||||
{
|
||||
ENTER("get_remaining_time");
|
||||
ENTER("get_remaining_time");
|
||||
|
||||
int err = 0;
|
||||
*stop_is_required = 0;
|
||||
int i=0;
|
||||
int err = 0;
|
||||
*stop_is_required = 0;
|
||||
int i=0;
|
||||
|
||||
for (i=0; i < MAX_ACTIVITY_CHECK && (*stop_is_required == 0); i++)
|
||||
{
|
||||
err = wave_get_remaining_time( sample, time_in_ms);
|
||||
for (i=0; i < MAX_ACTIVITY_CHECK && (*stop_is_required == 0); i++)
|
||||
{
|
||||
err = wave_get_remaining_time( sample, time_in_ms);
|
||||
|
||||
if (err || wave_is_busy(NULL) || (*time_in_ms == 0))
|
||||
{ // if err, stream not available: quit
|
||||
if (err || wave_is_busy(NULL) || (*time_in_ms == 0))
|
||||
{ // if err, stream not available: quit
|
||||
// if wave is busy, time_in_ms is known: quit
|
||||
// if wave is not busy but remaining time == 0, event is reached: quit
|
||||
break;
|
||||
break;
|
||||
}
|
||||
|
||||
// stream opened but not active
|
||||
@@ -448,10 +447,10 @@ static int get_remaining_time(uint32_t sample, uint32_t* time_in_ms, int* stop_i
|
||||
//
|
||||
// wait for the close of stream
|
||||
|
||||
*stop_is_required = sleep_until_timeout_or_stop_request( ACTIVITY_TIMEOUT);
|
||||
}
|
||||
*stop_is_required = sleep_until_timeout_or_stop_request( ACTIVITY_TIMEOUT);
|
||||
}
|
||||
|
||||
return err;
|
||||
return err;
|
||||
}
|
||||
|
||||
//>
|
||||
@@ -459,154 +458,155 @@ static int get_remaining_time(uint32_t sample, uint32_t* time_in_ms, int* stop_i
|
||||
|
||||
static void* polling_thread(void*)
|
||||
{
|
||||
ENTER("polling_thread");
|
||||
ENTER("polling_thread");
|
||||
|
||||
while(1)
|
||||
{
|
||||
int a_stop_is_required=0;
|
||||
|
||||
SHOW_TIME("polling_thread > locking\n");
|
||||
int a_status = pthread_mutex_lock(&my_mutex);
|
||||
SHOW_TIME("polling_thread > locked (my_event_is_running = 0)\n");
|
||||
my_event_is_running = 0;
|
||||
pthread_mutex_unlock(&my_mutex);
|
||||
SHOW_TIME("polling_thread > unlocked\n");
|
||||
|
||||
SHOW_TIME("polling_thread > wait for my_sem_start_is_required\n");
|
||||
|
||||
while ((sem_wait(&my_sem_start_is_required) == -1) && errno == EINTR)
|
||||
while(1)
|
||||
{
|
||||
continue; // Restart when interrupted by handler
|
||||
}
|
||||
int a_stop_is_required=0;
|
||||
|
||||
SHOW_TIME("polling_thread > get my_sem_start_is_required\n");
|
||||
SHOW_TIME("polling_thread > locking\n");
|
||||
int a_status = pthread_mutex_lock(&my_mutex);
|
||||
SHOW_TIME("polling_thread > locked (my_event_is_running = 0)\n");
|
||||
my_event_is_running = 0;
|
||||
pthread_mutex_unlock(&my_mutex);
|
||||
SHOW_TIME("polling_thread > unlocked\n");
|
||||
|
||||
a_status = pthread_mutex_lock(&my_mutex);
|
||||
SHOW_TIME("polling_thread > locked (my_event_is_running = 1)\n");
|
||||
my_event_is_running = 1;
|
||||
pthread_mutex_unlock(&my_mutex);
|
||||
SHOW_TIME("polling_thread > unlocked\n");
|
||||
SHOW_TIME("polling_thread > wait for my_sem_start_is_required\n");
|
||||
|
||||
a_stop_is_required=0;
|
||||
a_status = sem_getvalue(&my_sem_stop_is_required, &a_stop_is_required);
|
||||
if ((a_status==0) && a_stop_is_required)
|
||||
{
|
||||
SHOW("polling_thread > stop required (%d)\n", __LINE__);
|
||||
while(0 == sem_trywait(&my_sem_stop_is_required))
|
||||
{
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
a_stop_is_required=0;
|
||||
}
|
||||
|
||||
// In this loop, my_event_is_running = 1
|
||||
while (head && !a_stop_is_required)
|
||||
{
|
||||
SHOW_TIME("polling_thread > check head\n");
|
||||
while(0 == sem_trywait(&my_sem_start_is_required))
|
||||
{
|
||||
};
|
||||
|
||||
espeak_EVENT* event = (espeak_EVENT*)(head->data);
|
||||
assert(event);
|
||||
|
||||
uint32_t time_in_ms = 0;
|
||||
|
||||
int err = get_remaining_time((uint32_t)event->sample,
|
||||
&time_in_ms,
|
||||
&a_stop_is_required);
|
||||
if (a_stop_is_required)
|
||||
{
|
||||
break;
|
||||
}
|
||||
else if (err != 0)
|
||||
{
|
||||
// No available time: the event is deleted.
|
||||
SHOW("polling_thread > %s\n","audio device down");
|
||||
a_status = pthread_mutex_lock(&my_mutex);
|
||||
SHOW_TIME("polling_thread > locked\n");
|
||||
event_delete( (espeak_EVENT*)pop());
|
||||
a_status = pthread_mutex_unlock(&my_mutex);
|
||||
SHOW_TIME("polling_thread > unlocked\n");
|
||||
}
|
||||
else if (time_in_ms==0)
|
||||
{ // the event is already reached.
|
||||
if (my_callback)
|
||||
while ((sem_wait(&my_sem_start_is_required) == -1) && errno == EINTR)
|
||||
{
|
||||
event_notify(event);
|
||||
// the user_data (and the type) are cleaned to be sure
|
||||
// that MSG_TERMINATED is called twice (at delete time too).
|
||||
event->type=espeakEVENT_LIST_TERMINATED;
|
||||
event->user_data=NULL;
|
||||
continue; // Restart when interrupted by handler
|
||||
}
|
||||
a_status = pthread_mutex_lock(&my_mutex);
|
||||
SHOW_TIME("polling_thread > locked\n");
|
||||
event_delete( (espeak_EVENT*)pop());
|
||||
a_status = pthread_mutex_unlock(&my_mutex);
|
||||
SHOW_TIME("polling_thread > unlocked\n");
|
||||
|
||||
a_stop_is_required=0;
|
||||
a_status = sem_getvalue(&my_sem_stop_is_required, &a_stop_is_required);
|
||||
if ((a_status==0) && a_stop_is_required)
|
||||
SHOW_TIME("polling_thread > get my_sem_start_is_required\n");
|
||||
|
||||
a_status = pthread_mutex_lock(&my_mutex);
|
||||
SHOW_TIME("polling_thread > locked (my_event_is_running = 1)\n");
|
||||
my_event_is_running = 1;
|
||||
pthread_mutex_unlock(&my_mutex);
|
||||
SHOW_TIME("polling_thread > unlocked\n");
|
||||
|
||||
a_stop_is_required=0;
|
||||
a_status = sem_getvalue(&my_sem_stop_is_required, &a_stop_is_required);
|
||||
if ((a_status==0) && a_stop_is_required)
|
||||
{
|
||||
SHOW("polling_thread > stop required (%d)\n", __LINE__);
|
||||
while(0 == sem_trywait(&my_sem_stop_is_required))
|
||||
{
|
||||
};
|
||||
SHOW("polling_thread > stop required (%d)\n", __LINE__);
|
||||
while(0 == sem_trywait(&my_sem_stop_is_required))
|
||||
{
|
||||
};
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
a_stop_is_required=0;
|
||||
a_stop_is_required=0;
|
||||
}
|
||||
}
|
||||
else
|
||||
{ // The event will be notified soon: sleep until timeout or stop request
|
||||
a_stop_is_required = sleep_until_timeout_or_stop_request(time_in_ms);
|
||||
}
|
||||
}
|
||||
|
||||
a_status = pthread_mutex_lock(&my_mutex);
|
||||
SHOW_TIME("polling_thread > locked\n");
|
||||
|
||||
SHOW_TIME("polling_thread > my_event_is_running = 0\n");
|
||||
my_event_is_running = 0;
|
||||
|
||||
if(!a_stop_is_required)
|
||||
{
|
||||
a_status = sem_getvalue(&my_sem_stop_is_required, &a_stop_is_required);
|
||||
if ((a_status==0) && a_stop_is_required)
|
||||
{
|
||||
SHOW("polling_thread > stop required (%d)\n", __LINE__);
|
||||
while(0 == sem_trywait(&my_sem_stop_is_required))
|
||||
// In this loop, my_event_is_running = 1
|
||||
while (head && !a_stop_is_required)
|
||||
{
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
a_stop_is_required=0;
|
||||
}
|
||||
SHOW_TIME("polling_thread > check head\n");
|
||||
while(0 == sem_trywait(&my_sem_start_is_required))
|
||||
{
|
||||
};
|
||||
|
||||
espeak_EVENT* event = (espeak_EVENT*)(head->data);
|
||||
assert(event);
|
||||
|
||||
uint32_t time_in_ms = 0;
|
||||
|
||||
int err = get_remaining_time((uint32_t)event->sample,
|
||||
&time_in_ms,
|
||||
&a_stop_is_required);
|
||||
if (a_stop_is_required)
|
||||
{
|
||||
break;
|
||||
}
|
||||
else if (err != 0)
|
||||
{
|
||||
// No available time: the event is deleted.
|
||||
SHOW("polling_thread > %s\n","audio device down");
|
||||
a_status = pthread_mutex_lock(&my_mutex);
|
||||
SHOW_TIME("polling_thread > locked\n");
|
||||
event_delete( (espeak_EVENT*)pop());
|
||||
a_status = pthread_mutex_unlock(&my_mutex);
|
||||
SHOW_TIME("polling_thread > unlocked\n");
|
||||
}
|
||||
else if (time_in_ms==0)
|
||||
{ // the event is already reached.
|
||||
if (my_callback)
|
||||
{
|
||||
event_notify(event);
|
||||
// the user_data (and the type) are cleaned to be sure
|
||||
// that MSG_TERMINATED is called twice (at delete time too).
|
||||
event->type=espeakEVENT_LIST_TERMINATED;
|
||||
event->user_data=NULL;
|
||||
}
|
||||
|
||||
a_status = pthread_mutex_lock(&my_mutex);
|
||||
SHOW_TIME("polling_thread > locked\n");
|
||||
event_delete( (espeak_EVENT*)pop());
|
||||
a_status = pthread_mutex_unlock(&my_mutex);
|
||||
SHOW_TIME("polling_thread > unlocked\n");
|
||||
|
||||
a_stop_is_required=0;
|
||||
a_status = sem_getvalue(&my_sem_stop_is_required, &a_stop_is_required);
|
||||
|
||||
if ((a_status==0) && a_stop_is_required)
|
||||
{
|
||||
SHOW("polling_thread > stop required (%d)\n", __LINE__);
|
||||
while(0 == sem_trywait(&my_sem_stop_is_required))
|
||||
{
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
a_stop_is_required=0;
|
||||
}
|
||||
}
|
||||
else
|
||||
{ // The event will be notified soon: sleep until timeout or stop request
|
||||
a_stop_is_required = sleep_until_timeout_or_stop_request(time_in_ms);
|
||||
}
|
||||
}
|
||||
|
||||
a_status = pthread_mutex_lock(&my_mutex);
|
||||
SHOW_TIME("polling_thread > locked\n");
|
||||
|
||||
SHOW_TIME("polling_thread > my_event_is_running = 0\n");
|
||||
my_event_is_running = 0;
|
||||
|
||||
if(!a_stop_is_required)
|
||||
{
|
||||
a_status = sem_getvalue(&my_sem_stop_is_required, &a_stop_is_required);
|
||||
if ((a_status==0) && a_stop_is_required)
|
||||
{
|
||||
SHOW("polling_thread > stop required (%d)\n", __LINE__);
|
||||
while(0 == sem_trywait(&my_sem_stop_is_required))
|
||||
{
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
a_stop_is_required=0;
|
||||
}
|
||||
}
|
||||
|
||||
a_status = pthread_mutex_unlock(&my_mutex);
|
||||
SHOW_TIME("polling_thread > unlocked\n");
|
||||
|
||||
if (a_stop_is_required)
|
||||
{
|
||||
SHOW("polling_thread > %s\n","stop required!");
|
||||
// no mutex required since the stop command is synchronous
|
||||
// and waiting for my_sem_stop_is_acknowledged
|
||||
init();
|
||||
|
||||
// acknowledge the stop request
|
||||
SHOW_TIME("polling_thread > post my_sem_stop_is_acknowledged\n");
|
||||
a_status = sem_post(&my_sem_stop_is_acknowledged);
|
||||
}
|
||||
}
|
||||
|
||||
a_status = pthread_mutex_unlock(&my_mutex);
|
||||
SHOW_TIME("polling_thread > unlocked\n");
|
||||
|
||||
if (a_stop_is_required)
|
||||
{
|
||||
SHOW("polling_thread > %s\n","stop required!");
|
||||
// no mutex required since the stop command is synchronous
|
||||
// and waiting for my_sem_stop_is_acknowledged
|
||||
init();
|
||||
|
||||
// acknowledge the stop request
|
||||
SHOW_TIME("polling_thread > post my_sem_stop_is_acknowledged\n");
|
||||
a_status = sem_post(&my_sem_stop_is_acknowledged);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return NULL;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
//>
|
||||
@@ -615,100 +615,100 @@ enum {MAX_NODE_COUNTER=1000};
|
||||
// return 1 if ok, 0 otherwise
|
||||
static espeak_ERROR push(void* the_data)
|
||||
{
|
||||
ENTER("event > push");
|
||||
ENTER("event > push");
|
||||
|
||||
assert((!head && !tail) || (head && tail));
|
||||
assert((!head && !tail) || (head && tail));
|
||||
|
||||
if (the_data == NULL)
|
||||
{
|
||||
SHOW("event > push > event=0x%x\n", NULL);
|
||||
return EE_INTERNAL_ERROR;
|
||||
}
|
||||
if (the_data == NULL)
|
||||
{
|
||||
SHOW("event > push > event=0x%x\n", NULL);
|
||||
return EE_INTERNAL_ERROR;
|
||||
}
|
||||
|
||||
if (node_counter >= MAX_NODE_COUNTER)
|
||||
{
|
||||
SHOW("event > push > %s\n", "EE_BUFFER_FULL");
|
||||
return EE_BUFFER_FULL;
|
||||
}
|
||||
|
||||
node *n = (node *)malloc(sizeof(node));
|
||||
if (n == NULL)
|
||||
{
|
||||
return EE_INTERNAL_ERROR;
|
||||
}
|
||||
|
||||
if (head == NULL)
|
||||
{
|
||||
head = n;
|
||||
tail = n;
|
||||
}
|
||||
else
|
||||
{
|
||||
tail->next = n;
|
||||
tail = n;
|
||||
}
|
||||
|
||||
tail->next = NULL;
|
||||
tail->data = the_data;
|
||||
|
||||
node_counter++;
|
||||
SHOW("event > push > counter=%d (uid=%d)\n",node_counter,((espeak_EVENT*)the_data)->unique_identifier);
|
||||
|
||||
return EE_OK;
|
||||
if (node_counter >= MAX_NODE_COUNTER)
|
||||
{
|
||||
SHOW("event > push > %s\n", "EE_BUFFER_FULL");
|
||||
return EE_BUFFER_FULL;
|
||||
}
|
||||
|
||||
node *n = (node *)malloc(sizeof(node));
|
||||
if (n == NULL)
|
||||
{
|
||||
return EE_INTERNAL_ERROR;
|
||||
}
|
||||
|
||||
if (head == NULL)
|
||||
{
|
||||
head = n;
|
||||
tail = n;
|
||||
}
|
||||
else
|
||||
{
|
||||
tail->next = n;
|
||||
tail = n;
|
||||
}
|
||||
|
||||
tail->next = NULL;
|
||||
tail->data = the_data;
|
||||
|
||||
node_counter++;
|
||||
SHOW("event > push > counter=%d (uid=%d)\n",node_counter,((espeak_EVENT*)the_data)->unique_identifier);
|
||||
|
||||
return EE_OK;
|
||||
}
|
||||
|
||||
static void* pop()
|
||||
{
|
||||
ENTER("event > pop");
|
||||
void* the_data = NULL;
|
||||
|
||||
assert((!head && !tail) || (head && tail));
|
||||
|
||||
if (head != NULL)
|
||||
{
|
||||
node* n = head;
|
||||
the_data = n->data;
|
||||
head = n->next;
|
||||
free(n);
|
||||
node_counter--;
|
||||
SHOW("event > pop > event=0x%x (counter=%d, uid=%d)\n",the_data, node_counter,((espeak_EVENT*)the_data)->unique_identifier);
|
||||
}
|
||||
|
||||
if(head == NULL)
|
||||
{
|
||||
tail = NULL;
|
||||
}
|
||||
|
||||
return the_data;
|
||||
ENTER("event > pop");
|
||||
void* the_data = NULL;
|
||||
|
||||
assert((!head && !tail) || (head && tail));
|
||||
|
||||
if (head != NULL)
|
||||
{
|
||||
node* n = head;
|
||||
the_data = n->data;
|
||||
head = n->next;
|
||||
free(n);
|
||||
node_counter--;
|
||||
SHOW("event > pop > event=0x%x (counter=%d, uid=%d)\n",the_data, node_counter,((espeak_EVENT*)the_data)->unique_identifier);
|
||||
}
|
||||
|
||||
if(head == NULL)
|
||||
{
|
||||
tail = NULL;
|
||||
}
|
||||
|
||||
return the_data;
|
||||
}
|
||||
|
||||
|
||||
static void init()
|
||||
{
|
||||
ENTER("event > init");
|
||||
|
||||
while (event_delete( (espeak_EVENT*)pop() ))
|
||||
{}
|
||||
|
||||
node_counter = 0;
|
||||
ENTER("event > init");
|
||||
|
||||
while (event_delete( (espeak_EVENT*)pop() ))
|
||||
{}
|
||||
|
||||
node_counter = 0;
|
||||
}
|
||||
|
||||
//>
|
||||
//<event_terminate
|
||||
void event_terminate()
|
||||
{
|
||||
ENTER("event_terminate");
|
||||
|
||||
if (my_thread)
|
||||
{
|
||||
pthread_cancel(my_thread);
|
||||
pthread_join(my_thread,NULL);
|
||||
pthread_mutex_destroy(&my_mutex);
|
||||
sem_destroy(&my_sem_start_is_required);
|
||||
sem_destroy(&my_sem_stop_is_required);
|
||||
sem_destroy(&my_sem_stop_is_acknowledged);
|
||||
init(); // purge event
|
||||
}
|
||||
ENTER("event_terminate");
|
||||
|
||||
if (my_thread)
|
||||
{
|
||||
pthread_cancel(my_thread);
|
||||
pthread_join(my_thread,NULL);
|
||||
pthread_mutex_destroy(&my_mutex);
|
||||
sem_destroy(&my_sem_start_is_required);
|
||||
sem_destroy(&my_sem_stop_is_required);
|
||||
sem_destroy(&my_sem_stop_is_acknowledged);
|
||||
init(); // purge event
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user