enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

ecore - animator - found some truly messed up behavior inside vbox... 

add debug/error detection for the animator thread that might just sit
ans sleep waiting on epoll_wait + timerfd to expire... and it doesn't.
it SHOULD expire in less than 1 ft (frame time eg 16.66666667ms). but
i'm seeing it sometimes take 4 or 6 or 8 SECONDS to have epoll_wait
wake up... even thought i now set epoll_wait to always expire in 200ms
no matter what... even that it doesn't honor. something truly messed
up is happening with scheduling and i think this cascades through
everything - i see evas doing eglSwapBuffers() with nothing appearing
in the vbox screen... truly messed up. at least this adds some rror
detection for this and is at least a warning to a user that something
is messed up.
This commit is contained in:
Carsten Haitzler 2021-05-13 00:56:33 +01:00
parent 75fe29b1f5
commit f3682a34f7
1 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/lib/ecore/ecore_anim.c
View File

@ -136,11 +136,10 @@ _timer_tick_core(void *data EINA_UNUSED, Ecore_Thread *thread)
struct epoll_event pollincoming[2]; struct epoll_event pollincoming[2];
uint64_t timerfdbuf; uint64_t timerfdbuf;
int i; int i;
unsigned int t_ft;
double pframetime = -1.0;
struct itimerspec tspec_new; struct itimerspec tspec_new;
struct itimerspec tspec_old; struct itimerspec tspec_old;
#endif #endif
double t_out, t_gap, t_target;
fd_set rfds, wfds, exfds; fd_set rfds, wfds, exfds;
struct timeval tv; struct timeval tv;
Eina_Bool data_control; Eina_Bool data_control;
@ -203,6 +202,7 @@ _timer_tick_core(void *data EINA_UNUSED, Ecore_Thread *thread)
if (pollfd >= 0) if (pollfd >= 0)
{ {
while (!ecore_thread_check(thread)) while (!ecore_thread_check(thread))
{ {
data_control = EINA_FALSE; data_control = EINA_FALSE;
@ -213,21 +213,23 @@ _timer_tick_core(void *data EINA_UNUSED, Ecore_Thread *thread)
t0 = ecore_time_get(); t0 = ecore_time_get();
d = fmod(t0, ft); d = fmod(t0, ft);
t_target = t0 - d + ft;
if (tick) if (tick)
{ {
if (!EINA_DBL_EQ(pframetime, ft))
{ t = (ft - d) * 1000000000.0;
t = (ft - d) * 1000000000.0; tspec_new.it_value.tv_sec = t / 1000000000;
t_ft = ft * 1000000000.0; tspec_new.it_value.tv_nsec = t % 1000000000;
tspec_new.it_value.tv_sec = t / 1000000000; tspec_new.it_interval.tv_sec = 0;
tspec_new.it_value.tv_nsec = t % 1000000000; tspec_new.it_interval.tv_nsec = 0;
tspec_new.it_interval.tv_sec = t_ft / 1000000000; timerfd_settime(timerfd, 0, &tspec_new, &tspec_old);
tspec_new.it_interval.tv_nsec = t_ft % 1000000000; ret = epoll_wait(pollfd, pollincoming, 2, 200);
timerfd_settime(timerfd, 0, &tspec_new, &tspec_old); t_out = ecore_time_get();
pframetime = ft; t_gap = t_out - t0;
} if (t_gap > (ft * 2.0))
DBG("sleep..."); fprintf(stderr,
ret = epoll_wait(pollfd, pollincoming, 2, -1); "ERROR: ecore_animator thread - epoll_wait(..., 200) at %1.5f should have slept ~ %1.5fs but took %1.5fs!\n",
t0, ft, t_out - t0);
} }
else else
{ {
@ -235,9 +237,7 @@ _timer_tick_core(void *data EINA_UNUSED, Ecore_Thread *thread)
tspec_new.it_value.tv_nsec = 0; tspec_new.it_value.tv_nsec = 0;
tspec_new.it_interval.tv_sec = 0; tspec_new.it_interval.tv_sec = 0;
tspec_new.it_interval.tv_nsec = 0; tspec_new.it_interval.tv_nsec = 0;
pframetime = -1.0;
timerfd_settime(timerfd, 0, &tspec_new, &tspec_old); timerfd_settime(timerfd, 0, &tspec_new, &tspec_old);
DBG("wait...");
ret = epoll_wait(pollfd, pollincoming, 2, -1); ret = epoll_wait(pollfd, pollincoming, 2, -1);
} }
@ -263,12 +263,11 @@ _timer_tick_core(void *data EINA_UNUSED, Ecore_Thread *thread)
{ {
ERR("Cannot read from animator control fd"); ERR("Cannot read from animator control fd");
} }
DBG("tick = %i", tick);
if (tick == -1) goto done; if (tick == -1) goto done;
} }
else if (data_timeout) else if (data_timeout)
{ {
if (tick) _timer_send_time(t0 - d + ft, thread); if (tick) _timer_send_time(t_target, thread);
} }
} }
} }
@ -289,17 +288,22 @@ _timer_tick_core(void *data EINA_UNUSED, Ecore_Thread *thread)
t0 = ecore_time_get(); t0 = ecore_time_get();
d = fmod(t0, ft); d = fmod(t0, ft);
t_target = t0 - d + ft;
if (tick) if (tick)
{ {
DBG("sleep..."); t = (ft - d) * 1000000.0;
t = (animators_frametime - d) * 1000000.0;
tv.tv_sec = t / 1000000; tv.tv_sec = t / 1000000;
tv.tv_usec = t % 1000000; tv.tv_usec = t % 1000000;
ret = select(timer_fd_read + 1, &rfds, &wfds, &exfds, &tv); ret = select(timer_fd_read + 1, &rfds, &wfds, &exfds, &tv);
t_out = ecore_time_get();
t_gap = t_out - t0;
if (t_gap > (ft * 2.0))
fprintf(stderr,
"ERROR: ecore_animator thread - select() at %1.5f should have slept ~ %1.5fs but took %1.5fs!\n",
t0, ft, t_out - t0);
} }
else else
{ {
DBG("wait...");
ret = select(timer_fd_read + 1, &rfds, &wfds, &exfds, NULL); ret = select(timer_fd_read + 1, &rfds, &wfds, &exfds, NULL);
} }
if ((ret == 1) && (FD_ISSET(timer_fd_read, &rfds))) if ((ret == 1) && (FD_ISSET(timer_fd_read, &rfds)))
@ -317,7 +321,7 @@ _timer_tick_core(void *data EINA_UNUSED, Ecore_Thread *thread)
} }
else if (data_timeout) else if (data_timeout)
{ {
if (tick) _timer_send_time(t0 - d + ft, thread); if (tick) _timer_send_time(t_target, thread);
} }
} }
} }