Obsolete
/
libipc-old
Archived
3
0
Fork 0
Code

modifications pubsub : CHANTIER

more_to_read
Philippe PITTOLI 2016-06-05 12:45:45 +02:00
parent 3e857026bf
commit 999f858f31
2 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
pubsub/pubsubd.c
View File

@ -9,31 +9,24 @@ ohshit(int rvalue, const char* str) {
exit(rvalue); exit(rvalue);
} }
// init lists // CHANNELS
void pubsubd_channels_init (struct channels *chans) { LIST_INIT(chans); }
void pubsubd_subscriber_init (struct app_list *al) { LIST_INIT(al); }
int void pubsubd_channels_init (struct channels *chans) { LIST_INIT(chans); }
pubsubd_channels_eq (const struct channel *c1, const struct channel *c2)
{
return (strncmp (c1->chan, c2->chan, c1->chanlen) == 0);
}
struct channels * pubsubd_channels_copy (struct channels *c);
void void
pubsubd_channels_add (struct channels *chans, struct channels *c) pubsubd_channels_add (struct channels *chans, struct channel *c)
{ {
if(!chans || !c) if(!chans || !c)
return; return;
struct process *n = pubsubd_channels_copy (c); struct channel *n = pubsubd_channel_copy (c);
LIST_INSERT_HEAD(al, n, entries); LIST_INSERT_HEAD(al, n, entries);
} }
void void
pubsubd_subscriber_del (struct app_list *al, struct process *p) pubsubd_channels_del (struct app_list *al, struct channel *c)
{ {
struct process *todel = srv_subscriber_get (al, p); struct channel *todel = pubsubd_channel_get (al, c);
if(todel != NULL) { if(todel != NULL) {
LIST_REMOVE(todel, entries); LIST_REMOVE(todel, entries);
srv_process_free (mfree, todel); srv_process_free (mfree, todel);
@ -42,6 +35,24 @@ pubsubd_subscriber_del (struct app_list *al, struct process *p)
} }
} }
struct channel * pubsubd_channel_copy (struct channel *c)
{
struct channel *copy;
copy = malloc (sizeof(struct channel));
memcpy (copy, c, sizeof(struct channel));
return copy;
}
int
pubsubd_channels_eq (const struct channel *c1, const struct channel *c2)
{
return (strncmp (c1->chan, c2->chan, c1->chanlen) == 0);
}
// SUBSCRIBER
void pubsubd_subscriber_init (struct app_list *al) { LIST_INIT(al); }
void void
pubsubd_subscriber_add (struct app_list *al, struct process *p) pubsubd_subscriber_add (struct app_list *al, struct process *p)
{ {
@ -68,7 +79,7 @@ pubsubd_subscriber_get (const struct app_list *al
void void
pubsubd_subscriber_del (struct app_list *al, struct process *p) pubsubd_subscriber_del (struct app_list *al, struct process *p)
{ {
struct process *todel = srv_subscriber_get (al, p); struct process *todel = pubsubd_subscriber_get (al, p);
if(todel != NULL) { if(todel != NULL) {
LIST_REMOVE(todel, entries); LIST_REMOVE(todel, entries);
srv_process_free (mfree, todel); srv_process_free (mfree, todel);
@ -155,7 +166,7 @@ void main_loop (const char *spath)
while (cnt--) { while (cnt--) {
// -1 : error, 0 = no new process, 1 = new process // -1 : error, 0 = no new process, 1 = new process
ret = service_get_new_process (&proc, spath); ret = srv_get_new_process (&proc, spath);
if (ret == -1) { if (ret == -1) {
fprintf (stderr, "error service_get_new_process\n"); fprintf (stderr, "error service_get_new_process\n");
continue; continue;
@ -173,7 +184,7 @@ void main_loop (const char *spath)
bzero(buf, BUFSIZ); bzero(buf, BUFSIZ);
// printf ("before read\n"); // printf ("before read\n");
if ((ret = service_read (&proc, &buf, &msize))) { if ((ret = srv_read (&proc, &buf, &msize))) {
fprintf(stdout, "error service_read %d\n", ret); fprintf(stdout, "error service_read %d\n", ret);
continue; continue;
} }
@ -181,10 +192,11 @@ void main_loop (const char *spath)
printf ("read, size %ld : %s\n", msize, buf); printf ("read, size %ld : %s\n", msize, buf);
// printf ("before proc write\n"); // printf ("before proc write\n");
if ((ret = service_write (&proc, &buf, msize))) { if ((ret = srv_write (&proc, &buf, msize))) {
fprintf(stdout, "error service_write %d\n", ret); fprintf(stdout, "error service_write %d\n", ret);
continue; continue;
} }
// printf ("after proc write\n"); // printf ("after proc write\n");
printf ("\033[32mStill \033[31m%d\033[32m applications to serve\n",cnt); printf ("\033[32mStill \033[31m%d\033[32m applications to serve\n",cnt);
} }

6
pubsub/pubsubd.h
View File

@ -19,13 +19,15 @@ struct channel {
size_t chanlen; size_t chanlen;
}; };
struct channel * pubsubd_channel_copy (struct channel *c);
int pubsubd_channel_eq (const struct channel *c1, const struct channel *c2);
struct channels { struct channels {
struct channel *chan; struct channel *chan;
LIST_ENTRY(channels) entries; LIST_ENTRY(channels) entries;
}; };
int pubsubd_channels_eq (const struct channels *c1, const struct channels *c2);
struct app_list { struct app_list {
struct process *p; struct process *p;
LIST_ENTRY(app_list) entries; LIST_ENTRY(app_list) entries;