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

ecore_con: changing from Ecore.Con.Base to Efl.Network.Base. 

Summary: Signed-off-by: Srivardhan Hebbar <sri.hebbar@samsung.com>

Reviewers: cedric

Subscribers: jpeg

Differential Revision: https://phab.enlightenment.org/D3696

Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
This commit is contained in:
Srivardhan Hebbar 2016-02-17 16:57:29 -08:00 committed by Cedric BAIL
parent ec2f92e35f
commit 865624dab0
7 changed files with 81 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile_Ecore_Con.am
View File

@ -2,7 +2,7 @@
### Library
ecore_con_eolian_files = \
lib/ecore_con/ecore_con_base.eo \
lib/ecore_con/efl_network_base.eo \
lib/ecore_con/efl_network_client.eo \
lib/ecore_con/efl_network_server.eo \
lib/ecore_con/efl_network_connector.eo \

2
src/lib/ecore_con/Ecore_Con_Eo.h
View File

@ -1,4 +1,4 @@
#include "ecore_con_base.eo.h"
#include "efl_network_base.eo.h"
#include "efl_network_server.eo.h"
#include "efl_network_connector.eo.h"
#include "efl_network_client.eo.h"

8
src/lib/ecore_con/Ecore_Con_Legacy.h
View File

@ -3,12 +3,18 @@
#include <Eina.h>
#include <Eo.h>
#include "ecore_con_base.eo.legacy.h"
#include "efl_network_base.eo.legacy.h"
#include "efl_network_server.eo.legacy.h"
#include "efl_network_connector.eo.legacy.h"
#include "efl_network_client.eo.legacy.h"
/********************************************************************
* ecore_con_base.eo.h
*******************************************************************/
typedef Eo Ecore_Con_Base;
/********************************************************************
* ecore_con_client.eo.h
*******************************************************************/

96
src/lib/ecore_con/ecore_con.c
View File

@ -297,7 +297,7 @@ ecore_con_shutdown(void)
}
EOLIAN static Eina_Bool
_ecore_con_base_lookup(Eo *kls_obj EINA_UNUSED, void *pd EINA_UNUSED, const char *name, Ecore_Con_Dns_Cb done_cb, const void *data)
_efl_network_base_lookup(Eo *kls_obj EINA_UNUSED, void *pd EINA_UNUSED, const char *name, Ecore_Con_Dns_Cb done_cb, const void *data)
{
Ecore_Con_Server *obj;
Ecore_Con_Lookup *lk;
@ -309,7 +309,7 @@ _ecore_con_base_lookup(Eo *kls_obj EINA_UNUSED, void *pd EINA_UNUSED, const char
obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL,
efl_network_server_connection_type_set(ECORE_CON_REMOTE_TCP),
efl_network_server_name_set(name),
ecore_con_obj_port_set(1025));
efl_network_base_port_set(1025));
lk = malloc(sizeof (Ecore_Con_Lookup));
if (!lk)
@ -366,7 +366,7 @@ ecore_con_server_add(Ecore_Con_Type compl_type,
obj = eo_add(EFL_NETWORK_SERVER_CLASS, NULL,
efl_network_server_connection_type_set(compl_type),
efl_network_server_name_set(name),
ecore_con_obj_port_set(port));
efl_network_base_port_set(port));
ecore_con_server_data_set(obj, (void *) data);
@ -465,7 +465,7 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
obj = eo_add(EFL_NETWORK_CONNECTOR_CLASS, NULL,
efl_network_server_connection_type_set(compl_type),
efl_network_server_name_set(name),
ecore_con_obj_port_set(port));
efl_network_base_port_set(port));
ecore_con_server_data_set(obj, (void *) data);
@ -548,11 +548,11 @@ error:
EAPI void
ecore_con_server_timeout_set(Ecore_Con *obj, double timeout)
{
eo_do((Ecore_Con *)obj, ecore_con_obj_timeout_set(timeout));
eo_do((Ecore_Con *)obj, efl_network_base_timeout_set(timeout));
}
EOLIAN static void
_efl_network_server_ecore_con_base_timeout_set(Eo *obj, Efl_Network_Server_Data *svr, double timeout)
_efl_network_server_efl_network_base_timeout_set(Eo *obj, Efl_Network_Server_Data *svr, double timeout)
{
if (svr->created)
svr->client_disconnect_time = timeout;
@ -566,11 +566,11 @@ EAPI double
ecore_con_server_timeout_get(const Ecore_Con *obj)
{
double ret;
return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_timeout_get());
return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_timeout_get());
}
EOLIAN static double
_efl_network_server_ecore_con_base_timeout_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr)
_efl_network_server_efl_network_base_timeout_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr)
{
return svr->created ? svr->client_disconnect_time : svr->disconnect_time;
}
@ -620,11 +620,11 @@ EAPI Eina_Bool
ecore_con_server_connected_get(const Ecore_Con *obj)
{
Eina_Bool ret;
return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_connected_get());
return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_connected_get());
}
EOLIAN static Eina_Bool
_efl_network_server_ecore_con_base_connected_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr)
_efl_network_server_efl_network_base_connected_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr)
{
return !svr->connecting;
}
@ -670,11 +670,11 @@ EAPI int
ecore_con_server_port_get(const Ecore_Con *obj)
{
int ret;
return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_port_get());
return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_port_get());
}
EOLIAN static void
_efl_network_server_ecore_con_base_port_set(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr, int port)
_efl_network_server_efl_network_base_port_set(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr, int port)
{
EO_CONSTRUCTOR_CHECK_RETURN(obj);
@ -682,7 +682,7 @@ _efl_network_server_ecore_con_base_port_set(Eo *obj EINA_UNUSED, Efl_Network_Ser
}
EOLIAN static int
_efl_network_server_ecore_con_base_port_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr)
_efl_network_server_efl_network_base_port_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr)
{
return svr->port;
}
@ -691,11 +691,11 @@ EAPI int
ecore_con_server_send(Ecore_Con *obj, const void *data, int size)
{
int ret;
return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_send(data, size));
return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_send(data, size));
}
EOLIAN static int
_efl_network_server_ecore_con_base_send(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr, const void *data, int size)
_efl_network_server_efl_network_base_send(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr, const void *data, int size)
{
EINA_SAFETY_ON_TRUE_RETURN_VAL(svr->delete_me, 0);
@ -748,11 +748,11 @@ EAPI const char *
ecore_con_server_ip_get(const Ecore_Con *obj)
{
const char *ret;
return eo_do_ret(obj, ret, ecore_con_obj_ip_get());
return eo_do_ret(obj, ret, efl_network_base_ip_get());
}
EOLIAN static const char *
_efl_network_server_ecore_con_base_ip_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr)
_efl_network_server_efl_network_base_ip_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr)
{
return svr->ip;
}
@ -761,11 +761,11 @@ EAPI double
ecore_con_server_uptime_get(const Ecore_Con *obj)
{
double ret;
return eo_do_ret(obj, ret, ecore_con_obj_uptime_get());
return eo_do_ret(obj, ret, efl_network_base_uptime_get());
}
EOLIAN static double
_efl_network_server_ecore_con_base_uptime_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr)
_efl_network_server_efl_network_base_uptime_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr)
{
return ecore_time_get() - svr->start_time;
}
@ -773,11 +773,11 @@ _efl_network_server_ecore_con_base_uptime_get(Eo *obj EINA_UNUSED, Efl_Network_S
EAPI void
ecore_con_server_flush(Ecore_Con *obj)
{
eo_do((Ecore_Con *)obj, ecore_con_obj_flush());
eo_do((Ecore_Con *)obj, efl_network_base_flush());
}
EOLIAN static void
_efl_network_server_ecore_con_base_flush(Eo *obj, Efl_Network_Server_Data *svr EINA_UNUSED)
_efl_network_server_efl_network_base_flush(Eo *obj, Efl_Network_Server_Data *svr EINA_UNUSED)
{
_ecore_con_server_flush(obj);
}
@ -803,11 +803,11 @@ EAPI int
ecore_con_client_send(Ecore_Con *obj, const void *data, int size)
{
int ret;
return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_send(data, size));
return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_send(data, size));
}
EOLIAN static int
_efl_network_client_ecore_con_base_send(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl, const void *data, int size)
_efl_network_client_efl_network_base_send(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl, const void *data, int size)
{
Efl_Network_Server_Data *host_server = NULL;
EINA_SAFETY_ON_TRUE_RETURN_VAL(cl->delete_me, 0);
@ -862,7 +862,7 @@ _efl_network_client_server_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl)
}
EOLIAN static Eina_Bool
_efl_network_client_ecore_con_base_connected_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl)
_efl_network_client_efl_network_base_connected_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl)
{
return !cl->delete_me;
}
@ -871,11 +871,11 @@ EAPI Eina_Bool
ecore_con_client_connected_get(const Ecore_Con *obj)
{
Eina_Bool ret;
return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_connected_get());
return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_connected_get());
}
EOLIAN static void
_efl_network_client_ecore_con_base_timeout_set(Eo *obj, Efl_Network_Client_Data *cl, double timeout)
_efl_network_client_efl_network_base_timeout_set(Eo *obj, Efl_Network_Client_Data *cl, double timeout)
{
cl->disconnect_time = timeout;
@ -885,11 +885,11 @@ _efl_network_client_ecore_con_base_timeout_set(Eo *obj, Efl_Network_Client_Data
EAPI void
ecore_con_client_timeout_set(Ecore_Con *obj, double timeout)
{
eo_do((Ecore_Con *)obj, ecore_con_obj_timeout_set(timeout));
eo_do((Ecore_Con *)obj, efl_network_base_timeout_set(timeout));
}
EOLIAN static double
_efl_network_client_ecore_con_base_timeout_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl)
_efl_network_client_efl_network_base_timeout_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl)
{
return cl->disconnect_time;
}
@ -898,7 +898,7 @@ EAPI double
ecore_con_client_timeout_get(const Ecore_Con *obj)
{
double ret;
return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_timeout_get());
return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_timeout_get());
}
EAPI void *
@ -938,7 +938,7 @@ ecore_con_client_data_get(Ecore_Con_Client *obj)
}
EOLIAN static const char *
_efl_network_client_ecore_con_base_ip_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl)
_efl_network_client_efl_network_base_ip_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl)
{
if (!cl->ip)
cl->ip = _ecore_con_pretty_ip(cl->client_addr);
@ -950,11 +950,11 @@ EAPI const char *
ecore_con_client_ip_get(const Ecore_Con *obj)
{
const char *ret;
return eo_do_ret(obj, ret, ecore_con_obj_ip_get());
return eo_do_ret(obj, ret, efl_network_base_ip_get());
}
EOLIAN static int
_efl_network_client_ecore_con_base_port_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl)
_efl_network_client_efl_network_base_port_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl)
{
Efl_Network_Server_Data *sd = eo_data_scope_get(cl->host_server, EFL_NETWORK_SERVER_CLASS);
@ -978,11 +978,11 @@ EAPI int
ecore_con_client_port_get(const Ecore_Con *obj)
{
int ret;
return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_port_get());
return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_port_get());
}
EOLIAN static double
_efl_network_client_ecore_con_base_uptime_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl)
_efl_network_client_efl_network_base_uptime_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl)
{
return ecore_time_get() - cl->start_time;
}
@ -991,11 +991,11 @@ EAPI double
ecore_con_client_uptime_get(const Ecore_Con *obj)
{
double ret;
return eo_do_ret(obj, ret, ecore_con_obj_uptime_get());
return eo_do_ret(obj, ret, efl_network_base_uptime_get());
}
EOLIAN static void
_efl_network_client_ecore_con_base_flush(Eo *obj, Efl_Network_Client_Data *cl EINA_UNUSED)
_efl_network_client_efl_network_base_flush(Eo *obj, Efl_Network_Client_Data *cl EINA_UNUSED)
{
_ecore_con_client_flush(obj);
}
@ -1003,18 +1003,18 @@ _efl_network_client_ecore_con_base_flush(Eo *obj, Efl_Network_Client_Data *cl EI
EAPI void
ecore_con_client_flush(Ecore_Con *obj)
{
eo_do((Ecore_Con *)obj, ecore_con_obj_flush());
eo_do((Ecore_Con *)obj, efl_network_base_flush());
}
EAPI int
ecore_con_server_fd_get(const Ecore_Con *obj)
{
int ret;
return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_fd_get());
return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_fd_get());
}
EOLIAN static int
_efl_network_server_ecore_con_base_fd_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr)
_efl_network_server_efl_network_base_fd_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr)
{
if (svr->created) return -1;
if (svr->delete_me) return -1;
@ -1022,7 +1022,7 @@ _efl_network_server_ecore_con_base_fd_get(Eo *obj EINA_UNUSED, Efl_Network_Serve
}
EOLIAN static int
_efl_network_client_ecore_con_base_fd_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl)
_efl_network_client_efl_network_base_fd_get(Eo *obj EINA_UNUSED, Efl_Network_Client_Data *cl)
{
return ecore_main_fd_handler_fd_get(cl->fd_handler);
}
@ -1031,7 +1031,7 @@ EAPI int
ecore_con_client_fd_get(const Ecore_Con *obj)
{
int ret;
return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_fd_get());
return eo_do_ret((Ecore_Con *)obj, ret, efl_network_base_fd_get());
}
/**
@ -1077,7 +1077,7 @@ ecore_con_event_server_add(Ecore_Con_Server *obj)
if (svr->upgrade) ev = ECORE_CON_EVENT_SERVER_UPGRADE;
ecore_event_add(ev, e,
_ecore_con_event_server_add_free, NULL);
eo_do(obj, eo_event_callback_call(ECORE_CON_BASE_EVENT_CONNECTION_UPGRADED, NULL));
eo_do(obj, eo_event_callback_call(EFL_NETWORK_BASE_EVENT_CONNECTION_UPGRADED, NULL));
_ecore_con_event_count++;
}
@ -1156,7 +1156,7 @@ ecore_con_event_server_data(Ecore_Con_Server *obj, unsigned char *buf, int num,
Ecore_Con_Event_Data_Received event_info = { NULL, 0 };
event_info.data = e->data;
event_info.size = e->size;
eo_do(obj, eo_event_callback_call(ECORE_CON_BASE_EVENT_DATA_RECEIVED, &event_info));
eo_do(obj, eo_event_callback_call(EFL_NETWORK_BASE_EVENT_DATA_RECEIVED, &event_info));
}
_ecore_con_event_count++;
}
@ -1181,7 +1181,7 @@ ecore_con_event_client_add(Ecore_Con_Client *obj)
if (cl->upgrade) ev = ECORE_CON_EVENT_CLIENT_UPGRADE;
ecore_event_add(ev, e,
(Ecore_End_Cb)_ecore_con_event_client_add_free, cl->host_server);
eo_do(obj, eo_event_callback_call(ECORE_CON_BASE_EVENT_CONNECTION_UPGRADED, NULL));
eo_do(obj, eo_event_callback_call(EFL_NETWORK_BASE_EVENT_CONNECTION_UPGRADED, NULL));
_ecore_con_event_count++;
}
@ -1263,7 +1263,7 @@ ecore_con_event_client_data(Ecore_Con_Client *obj, unsigned char *buf, int num,
Ecore_Con_Event_Data_Received event_info = { NULL, 0 };
event_info.data = e->data;
event_info.size = e->size;
eo_do(obj, eo_event_callback_call(ECORE_CON_BASE_EVENT_DATA_RECEIVED, &event_info));
eo_do(obj, eo_event_callback_call(EFL_NETWORK_BASE_EVENT_DATA_RECEIVED, &event_info));
}
_ecore_con_event_count++;
}
@ -1289,7 +1289,7 @@ _ecore_con_event_server_error(Ecore_Con_Server *obj, char *error, Eina_Bool dupl
DBG("%s", error);
svr->event_count = eina_list_append(svr->event_count, e);
ecore_event_add(ECORE_CON_EVENT_SERVER_ERROR, e, (Ecore_End_Cb)_ecore_con_event_server_error_free, NULL);
eo_do(obj, eo_event_callback_call(ECORE_CON_BASE_EVENT_CONNECTION_ERROR, e->error));
eo_do(obj, eo_event_callback_call(EFL_NETWORK_BASE_EVENT_CONNECTION_ERROR, e->error));
_ecore_con_event_count++;
}
@ -1310,7 +1310,7 @@ ecore_con_event_client_error(Ecore_Con_Client *obj, const char *error)
cl->event_count = eina_list_append(cl->event_count, e);
host_server->event_count = eina_list_append(host_server->event_count, e);
ecore_event_add(ECORE_CON_EVENT_CLIENT_ERROR, e, (Ecore_End_Cb)_ecore_con_event_client_error_free, cl->host_server);
eo_do(obj, eo_event_callback_call(ECORE_CON_BASE_EVENT_CONNECTION_ERROR, e->error));
eo_do(obj, eo_event_callback_call(EFL_NETWORK_BASE_EVENT_CONNECTION_ERROR, e->error));
_ecore_con_event_count++;
}
@ -3001,7 +3001,7 @@ _ecore_con_lookup_done(void *data,
free(lk);
}
#include "ecore_con_base.eo.c"
#include "efl_network_base.eo.c"
#include "efl_network_client.eo.c"
#include "efl_network_server.eo.c"
#include "efl_network_connector.eo.c"

4
src/lib/ecore_con/ecore_con_base.eo → src/lib/ecore_con/efl_network_base.eo
View File

@ -29,9 +29,9 @@ enum Ecore.Con.Type
socket_activate = (1 << 9)
}
abstract Ecore.Con.Base (Eo.Base) {
abstract Efl.Network.Base (Eo.Base) {
legacy_prefix: ecore_con;
eo_prefix: ecore_con_obj;
eo_prefix: efl_network_base;
data: null;
methods {
@property ip {

20
src/lib/ecore_con/efl_network_client.eo
View File

@ -1,4 +1,4 @@
class Efl.Network.Client (Ecore.Con.Base) {
class Efl.Network.Client (Efl.Network.Base) {
legacy_prefix: ecore_con_client;
eo_prefix: efl_network_client_obj;
methods {
@ -14,15 +14,15 @@ class Efl.Network.Client (Ecore.Con.Base) {
}
implements {
Eo.Base.destructor;
Ecore.Con.Base.ip.get;
Ecore.Con.Base.uptime.get;
Ecore.Con.Base.port.get;
Ecore.Con.Base.fd.get;
Ecore.Con.Base.connected.get;
Ecore.Con.Base.timeout.set;
Ecore.Con.Base.timeout.get;
Ecore.Con.Base.flush;
Ecore.Con.Base.send;
Efl.Network.Base.ip.get;
Efl.Network.Base.uptime.get;
Efl.Network.Base.port.get;
Efl.Network.Base.fd.get;
Efl.Network.Base.connected.get;
Efl.Network.Base.timeout.set;
Efl.Network.Base.timeout.get;
Efl.Network.Base.flush;
Efl.Network.Base.send;
}
}

24
src/lib/ecore_con/efl_network_server.eo
View File

@ -1,4 +1,4 @@
class Efl.Network.Server (Ecore.Con.Base) {
class Efl.Network.Server (Efl.Network.Base) {
legacy_prefix: ecore_con_server;
eo_prefix: efl_network_server;
methods {
@ -58,7 +58,7 @@ class Efl.Network.Server (Ecore.Con.Base) {
}
values {
// FIXME: Efl.Network.Client is needed, but that introduces a cycle
clients: const(list<const(Ecore.Con.Base) *>) *; [[The list of clients on this server.]]
clients: const(list<const(Efl.Network.Base) *>) *; [[The list of clients on this server.]]
}
}
@property connection_type {
@ -77,15 +77,15 @@ class Efl.Network.Server (Ecore.Con.Base) {
Eo.Base.constructor;
Eo.Base.destructor;
Eo.Base.finalize;
Ecore.Con.Base.ip.get;
Ecore.Con.Base.uptime.get;
Ecore.Con.Base.port.set;
Ecore.Con.Base.port.get;
Ecore.Con.Base.fd.get;
Ecore.Con.Base.connected.get;
Ecore.Con.Base.timeout.set;
Ecore.Con.Base.timeout.get;
Ecore.Con.Base.flush;
Ecore.Con.Base.send;
Efl.Network.Base.ip.get;
Efl.Network.Base.uptime.get;
Efl.Network.Base.port.set;
Efl.Network.Base.port.get;
Efl.Network.Base.fd.get;
Efl.Network.Base.connected.get;
Efl.Network.Base.timeout.set;
Efl.Network.Base.timeout.get;
Efl.Network.Base.flush;
Efl.Network.Base.send;
}
}