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

ecore: when relying on parent relationship for lifecycle, we should not use efl_del in the destructor.

This commit is contained in:
Cedric BAIL 2018-04-09 16:56:36 -07:00
parent 2306a3b090
commit 3e648c475f
2 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/lib/ecore/efl_io_buffered_stream.c
View File

@ -149,29 +149,8 @@ _efl_io_buffered_stream_efl_object_finalize(Eo *o, Efl_Io_Buffered_Stream_Data *
}
EOLIAN static void
_efl_io_buffered_stream_efl_object_destructor(Eo *o, Efl_Io_Buffered_Stream_Data *pd)
_efl_io_buffered_stream_efl_object_invalidate(Eo *o, Efl_Io_Buffered_Stream_Data *pd)
{
if (pd->incoming)
{
efl_del(pd->incoming);
pd->incoming = NULL;
}
if (pd->outgoing)
{
efl_del(pd->outgoing);
pd->outgoing = NULL;
}
if (pd->sender)
{
efl_del(pd->sender);
pd->sender = NULL;
}
if (pd->receiver)
{
efl_del(pd->receiver);
pd->receiver = NULL;
}
if (pd->inner_io)
{
efl_event_callback_array_del(pd->inner_io, _efl_io_buffered_stream_inner_io_cbs(), o);
@ -182,7 +161,19 @@ _efl_io_buffered_stream_efl_object_destructor(Eo *o, Efl_Io_Buffered_Stream_Data
pd->inner_io = NULL;
}
efl_destructor(efl_super(o, MY_CLASS));
pd->incoming = NULL;
pd->outgoing = NULL;
pd->sender = NULL;
pd->receiver = NULL;
if (!pd->is_finished)
{
fprintf(stderr, "forced finish\n");
pd->is_finished = EINA_TRUE;
efl_event_callback_call(o, EFL_IO_BUFFERED_STREAM_EVENT_FINISHED, NULL);
}
efl_invalidate(efl_super(o, MY_CLASS));
}
EOLIAN static Eina_Error

2
src/lib/ecore/efl_io_buffered_stream.eo
View File

@ -247,7 +247,7 @@ class Efl.Io.Buffered_Stream (Efl.Loop_Consumer, Efl.Io.Reader, Efl.Io.Writer, E
implements {
Efl.Object.finalize;
Efl.Object.destructor;
Efl.Object.invalidate;
Efl.Io.Closer.close;
Efl.Io.Closer.closed { get; }
Efl.Io.Closer.close_on_exec { get; set; }