Baguette
/
libipc-old
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

service de test fonctionne 

Protocole de test :

    echo "1 1 1" > /tmp/ipc/windows
    echo "blah" > /tmp/ipc/1-1-in
    cat /tmp/ipc/1-1-out

Ce qui n'a aucun sens, faut changer ça.
more_to_read
Philippe PITTOLI 2016-05-30 01:54:19 +02:00
parent bc9e807683
commit e80f19ffcc
3 changed files with 160 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
lib/communication.c
View File

@ -1,4 +1,6 @@
#include "communication.h"
#include <stdio.h>
#include <time.h>
int service_path (char *buf, const char *sname)
{
@ -70,17 +72,31 @@ int service_close (const char *fifopath)
return 0;
}
// FIXME only works for a single process
void service_get_new_processes (struct process **proc, int *nproc, int sfifo)
int service_get_new_process (struct process *proc, const char * spath)
{
if (spath == NULL) {
return -1;
}
char buf[BUFSIZ];
bzero (buf, BUFSIZ);
read (sfifo, buf, BUFSIZ);
//proc[0] = malloc(sizeof(struct process*) * 1); // FIXME
proc[0] = malloc(sizeof(struct process) * 1); // FIXME
// read the pipe, get a process to work on
int ret;
// unsigned long long int val = strtoul(s, NULL, 10);
struct timespec ts = { 0 };
struct timespec ts2 = { 0 };
FILE * f = fopen (spath, "r");
clock_gettime(CLOCK_REALTIME, &ts);
fgets (buf, BUFSIZ, f);
clock_gettime(CLOCK_REALTIME, &ts2);
fclose (f);
printf("sec: %ld nsec: %ld\n", ts.tv_sec, ts.tv_nsec);
printf("sec: %ld nsec: %ld\n", ts2.tv_sec, ts2.tv_nsec);
printf("diff nsec: %ld\n", ts2.tv_nsec - ts.tv_nsec);
char *token, *saveptr;
char *str;
@ -91,27 +107,71 @@ void service_get_new_processes (struct process **proc, int *nproc, int sfifo)
if (token == NULL)
break;
printf ("token : %s\n", token);
// do something
if (i == 1) {
int index = strchr (token, '-') - token;
char * buf_pid = strndup (token, index);
proc[0]->pid = strtoul(buf_pid, NULL, 10);
proc[0]->index = strtoul(token + index +1, NULL, 10);
printf ("buf_pid : %s\n", buf_pid);
printf ("pid : %d\n", proc[0]->pid);
printf ("index : %d\n", proc[0]->index);
proc->pid = strtoul(token, NULL, 10);
}
else if (i == 2) {
// FIXME
proc[0]->version = strtoul(token, NULL, 10);
proc->index = strtoul(token, NULL, 10);
}
else if (i == 3) {
proc->version = strtoul(token, NULL, 10);
}
}
*nproc = 1;
return 1;
}
// FIXME only works for a single process
void service_get_new_processes (struct process ***proc, int *nproc, char * spath)
{
if (proc == NULL || spath == NULL) {
return;
}
char buf[BUFSIZ];
bzero (buf, BUFSIZ);
// read the pipe, get a process to work on
FILE * f = fopen (spath, "rb");
fgets (buf, BUFSIZ, f);
fclose (f);
char *token, *line, *saveptr, *saveptr2;
char *str, *str2;
int i, j;
*nproc = 0;
proc[0] = malloc(sizeof(struct process**));
for (str2 = buf, j = 1; ; str2 = NULL, j++) {
line = strtok_r(str2, "\n", &saveptr2);
if (line == NULL)
break;
printf ("line : %s\n", line);
*nproc = *nproc +1;
proc[0] = realloc(proc[0], sizeof(struct process*) * (*nproc));
proc[0][*nproc -1] = malloc(sizeof(struct process));
for (str = line, i = 1; ; str = NULL, i++) {
token = strtok_r(str, " ", &saveptr);
if (token == NULL)
break;
if (i == 1) {
proc[0][*nproc -1]->pid = strtoul(token, NULL, 10);
}
else if (i == 2) {
proc[0][*nproc -1]->index = strtoul(token, NULL, 10);
}
else if (i == 3) {
proc[0][*nproc -1]->version = strtoul(token, NULL, 10);
}
}
}
}
void struct_process_free (struct process * p)
@ -121,7 +181,10 @@ void struct_process_free (struct process * p)
void service_free_processes (struct process **procs, int nproc)
{
while (--nproc != -1) {
printf ("free processes\n");
while (nproc--) {
printf ("free process %d\n", nproc);
struct_process_free (procs[nproc]);
}
}
@ -135,7 +198,8 @@ void gen_process_structure (struct process *p
}
void process_print (struct process *p) {
void process_print (struct process *p)
{
printf ("process %d : index %d\n", p->pid, p->index);
}
@ -238,7 +302,7 @@ int process_open_in (struct process *proc)
printf ("opening in %s\n", fifopathin);
proc->in = fopen (fifopathin, "rb");
printf ("opened\n");
printf ("opened : %d\n", proc->in);
return 0;
}
@ -256,27 +320,13 @@ int process_open_out (struct process *proc)
return 0;
}
int process_open (struct process *proc)
{
char fifopathin[PATH_MAX];
char fifopathout[PATH_MAX];
process_paths (fifopathin, fifopathout, proc->pid, proc->index);
printf ("opening %s\n", fifopathin);
proc->in = fopen (fifopathin, "rb");
printf ("opening %s\n", fifopathout);
proc->out = fopen (fifopathout, "wb");
printf ("opened\n");
return 0;
}
int process_close_in (struct process *proc)
{
printf ("closing in\n");
if (proc->in != 0) {
printf ("before fclose in\n");
fclose (proc->in);
printf ("after fclose in\n");
proc->in = 0;
}
return 0;
@ -302,6 +352,7 @@ int process_read (struct process *proc, void * buf, size_t * msize)
}
*msize = fread (buf, 1, *msize, proc->in); // FIXME check errors
printf ("DEBUG read, size %ld : %s\n", *msize, buf);
if ((ret = process_close_in (proc))) {
fprintf(stdout, "error process_close_in %d\n", ret);

13
lib/communication.h
View File

@ -13,7 +13,7 @@
#include <errno.h> // error numbers
#define TMPDIR "/tmp/"
#define TMPDIR "/tmp/ipc/"
#define COMMUNICATION_VERSION 1
@ -27,6 +27,11 @@ struct process {
FILE *in, *out;
};
struct service {
unsigned int version;
unsigned int index;
};
// TODO create the service process structure
int service_path (char *buf, const char *sname);
@ -44,16 +49,14 @@ void gen_process_structure (struct process *p
int service_create (const char *sname);
int service_close (const char *sname);
void service_get_new_processes (struct process **, int *nproc, int sfifo);
int service_get_new_process (struct process *proc, const char * spath);
void service_get_new_processes (struct process ***, int *nproc, char *spath);
void service_free_processes (struct process **, int nproc);
void process_print (struct process *);
int process_create (struct process *, int index); // called by the application
int process_destroy (struct process *); // called by the application
int process_open (struct process *); // called by the service & application
int process_close (struct process *); // called by the service & application
int process_read (struct process *, void * buf, size_t *);
int process_write (struct process *, void * buf, size_t);

78
service-test.c
View File

@ -11,41 +11,85 @@
void main_loop (const char *spath)
{
int ret;
int sfifo = open (spath, S_IRUSR); // opens the service named pipe
struct process proc;
#if 1
while (1) {
struct process *proc;
// -1 : error
// 0 = no new process
// 1 = new process
ret = service_get_new_process (&proc, spath);
if (ret == -1) {
fprintf (stderr, "Error service_get_new_process\n");
exit (1);
} else if (ret == 0) {
continue;
}
printf ("before print\n");
process_print (&proc);
printf ("after print\n");
// about the message
size_t msize = BUFSIZ;
char buf[BUFSIZ];
bzero(buf, BUFSIZ);
printf ("before read\n");
if ((ret = process_read (&proc, &buf, &msize))) {
fprintf(stdout, "error process_read %d\n", ret);
exit (1);
}
printf ("after read\n");
printf ("read, size %ld : %s\n", msize, buf);
printf ("before proc write\n");
if ((ret = process_write (&proc, &buf, msize))) {
fprintf(stdout, "error process_write %d\n", ret);
exit (1);
}
printf ("after proc write\n");
}
#endif
#if 0
int ret;
struct process **proc;
int nproc = 0;
do {
service_get_new_processes (&proc, &nproc, sfifo);
printf ("nb proc : %d\n", nproc);
while (1) {
service_get_new_processes (&proc, &nproc, spath);
// for each process : open, read, write, close
for (int i = 0 ; i < nproc ; i++) {
process_print (&proc[i]);
printf ("before print\n");
process_print (proc[i]);
printf ("after print, i = %d\n", i);
// about the message
size_t msize = BUFSIZ;
char buf[BUFSIZ];
bzero(buf, BUFSIZ);
if ((ret = process_read (&proc[i], &buf, &msize))) {
printf ("before read\n");
if ((ret = process_read (proc[i], &buf, &msize))) {
fprintf(stdout, "error process_read %d\n", ret);
exit (1);
}
printf ("after read\n");
printf ("read, size %ld : %s\n", msize, buf);
if ((ret = process_write (&proc[i], &buf, msize))) {
fprintf(stdout, "error process_read %d\n", ret);
printf ("before proc write\n");
if ((ret = process_write (proc[i], &buf, msize))) {
fprintf(stdout, "error process_write %d\n", ret);
exit (1);
}
printf ("after proc write\n");
}
service_free_processes (&proc, nproc);
} while (0); // it's a test, we only do it once
close (sfifo); // closes the service named pipe
service_free_processes (proc, nproc);
free (proc);
}
#endif
}
/*