Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_ipc
Modified Files:
Tag: SPLIT
Ecore_Ipc.h ecore_ipc.c
Log Message:
more basic parameters per ipc message. this shoudl be enough for most things
so you dont need a data payload at all.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_ipc/Attic/Ecore_Ipc.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -3 -r1.1.2.1 -r1.1.2.2
--- Ecore_Ipc.h 26 Mar 2003 07:54:48 -0000 1.1.2.1
+++ Ecore_Ipc.h 6 Aug 2003 02:29:08 -0000 1.1.2.2
@@ -50,6 +50,9 @@
/* FIXME: this needs to become an ipc message */
int major;
int minor;
+ int ref;
+ int ref_to;
+ int response;
void *data;
int size;
};
@@ -60,6 +63,9 @@
/* FIXME: this needs to become an ipc message */
int major;
int minor;
+ int ref;
+ int ref_to;
+ int response;
void *data;
int size;
};
@@ -83,10 +89,10 @@
void *ecore_ipc_server_data_get(Ecore_Ipc_Server *svr);
int ecore_ipc_server_connected_get(Ecore_Ipc_Server *svr);
/* FIXME: this needs to become an ipc message */
- int ecore_ipc_server_send(Ecore_Ipc_Server *svr, int major, int
minor, void *data, int size);
+ int ecore_ipc_server_send(Ecore_Ipc_Server *svr, int major, int
minor, int ref, int ref_to, int response, void *data, int size);
/* FIXME: this needs to become an ipc message */
- int ecore_ipc_client_send(Ecore_Ipc_Client *cl, int major, int
minor, void *data, int size);
+ int ecore_ipc_client_send(Ecore_Ipc_Client *cl, int major, int
minor, int ref, int ref_to, int response, void *data, int size);
Ecore_Ipc_Server *ecore_ipc_client_server_get(Ecore_Ipc_Client *cl);
void *ecore_ipc_client_del(Ecore_Ipc_Client *cl);
void ecore_ipc_client_data_set(Ecore_Ipc_Client *cl, const void
*data);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_ipc/Attic/ecore_ipc.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -3 -r1.1.2.2 -r1.1.2.3
--- ecore_ipc.c 8 Apr 2003 08:03:23 -0000 1.1.2.2
+++ ecore_ipc.c 6 Aug 2003 02:29:08 -0000 1.1.2.3
@@ -12,8 +12,11 @@
{
int major;
int minor;
+ int ref;
+ int ref_to;
+ int response;
int size;
-};
+} __attribute__ ((packed));
static void _ecore_ipc_free(void *data, void *ev);
static int _ecore_ipc_event_client_add(void *data, int ev_type, void *ev);
@@ -214,14 +217,17 @@
* <hr><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
*/
int
-ecore_ipc_server_send(Ecore_Ipc_Server *svr, int major, int minor, void *data, int
size)
+ecore_ipc_server_send(Ecore_Ipc_Server *svr, int major, int minor, int ref, int
ref_to, int response, void *data, int size)
{
Ecore_Ipc_Msg_Head msg;
int ret;
- msg.major = htonl(major);
- msg.minor = htonl(minor);
- msg.size = htonl(size);
+ msg.major = htonl(major);
+ msg.minor = htonl(minor);
+ msg.ref = htonl(ref);
+ msg.ref_to = htonl(ref_to);
+ msg.response = htonl(response);
+ msg.size = htonl(size);
ret = ecore_con_server_send(svr->server, &msg, sizeof(Ecore_Ipc_Msg_Head));
if (size > 0) ret |= ecore_con_server_send(svr->server, data, size);
return ret;
@@ -234,14 +240,17 @@
* <hr><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
*/
int
-ecore_ipc_client_send(Ecore_Ipc_Client *cl, int major, int minor, void *data, int
size)
+ecore_ipc_client_send(Ecore_Ipc_Client *cl, int major, int minor, int ref, int
ref_to, int response, void *data, int size)
{
Ecore_Ipc_Msg_Head msg;
int ret;
- msg.major = htonl(major);
- msg.minor = htonl(minor);
- msg.size = htonl(size);
+ msg.major = htonl(major);
+ msg.minor = htonl(minor);
+ msg.ref = htonl(ref);
+ msg.ref_to = htonl(ref_to);
+ msg.response = htonl(response);
+ msg.size = htonl(size);
ret = ecore_con_client_send(cl->client, &msg, sizeof(Ecore_Ipc_Msg_Head));
if (size > 0) ret |= ecore_con_client_send(cl->client, data, size);
return ret;
@@ -466,11 +475,14 @@
msg = (Ecore_Ipc_Msg_Head *)cl->buf;
if (cl->buf_size >= sizeof(Ecore_Ipc_Msg_Head))
{
- int major, minor, size;
+ int major, minor, ref, ref_to, response, size;
- major = ntohl(msg->major);
- minor = ntohl(msg->minor);
- size = ntohl(msg->size);
+ major = ntohl(msg->major);
+ minor = ntohl(msg->minor);
+ ref = ntohl(msg->ref);
+ ref_to = ntohl(msg->ref_to);
+ response = ntohl(msg->response);
+ size = ntohl(msg->size);
/* there is enough data in the buffer for a full message */
if (cl->buf_size >= (sizeof(Ecore_Ipc_Msg_Head) + size))
{
@@ -486,11 +498,14 @@
e2 = calloc(1, sizeof(Ecore_Ipc_Event_Client_Data));
if (e2)
{
- e2->client = cl;
- e2->major = major;
- e2->minor = minor;
- e2->size = size;
- e2->data = buf;
+ e2->client = cl;
+ e2->major = major;
+ e2->minor = minor;
+ e2->ref = ref;
+ e2->ref_to = ref_to;
+ e2->response = response;
+ e2->size = size;
+ e2->data = buf;
ecore_event_add(ECORE_IPC_EVENT_CLIENT_DATA, e2,
_ecore_ipc_event_client_data_free, NULL);
}
@@ -564,11 +579,14 @@
msg = (Ecore_Ipc_Msg_Head *)svr->buf;
if (svr->buf_size >= sizeof(Ecore_Ipc_Msg_Head))
{
- int major, minor, size;
+ int major, minor, ref, ref_to, response, size;
- major = ntohl(msg->major);
- minor = ntohl(msg->minor);
- size = ntohl(msg->size);
+ major = ntohl(msg->major);
+ minor = ntohl(msg->minor);
+ ref = ntohl(msg->ref);
+ ref_to = ntohl(msg->ref_to);
+ response = ntohl(msg->response);
+ size = ntohl(msg->size);
/* there is enough data in the buffer for a full message */
if (svr->buf_size >= (sizeof(Ecore_Ipc_Msg_Head) + size))
{
@@ -584,11 +602,14 @@
e2 = calloc(1, sizeof(Ecore_Ipc_Event_Server_Data));
if (e2)
{
- e2->server = svr;
- e2->major = major;
- e2->minor = minor;
- e2->size = size;
- e2->data = buf;
+ e2->server = svr;
+ e2->major = major;
+ e2->minor = minor;
+ e2->ref = ref;
+ e2->ref_to = ref_to;
+ e2->response = response;
+ e2->size = size;
+ e2->data = buf;
ecore_event_add(ECORE_IPC_EVENT_SERVER_DATA, e2,
_ecore_ipc_event_server_data_free, NULL);
}
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
