amigan/phoned
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Completely threaded...and should be thread safe!

Browse source
This commit is contained in:
dcp1990 2005-06-13 01:13:48 +00:00
parent e78bcfbd3e
commit 415f87a910
3 changed files with 49 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phoned/main.c
View file

@ -14,7 +14,8 @@
extern struct conf cf; extern struct conf cf;
short difflog = 0; short difflog = 0;
extern pthread_mutex_t cfmx; extern pthread_mutex_t cfmx;
extern pthread_t networkth;
extern pthread_t modemth;
void usage(argv) void usage(argv)
const char* argv; const char* argv;
{ {
@ -51,8 +52,8 @@ int main(argc, argv)
cf.loglevels = LL_ALL; cf.loglevels = LL_ALL;
pthread_mutex_unlock(&cfmx); pthread_mutex_unlock(&cfmx);
initialize(); initialize();
network(); pthread_create(&networkth, NULL, network, NULL);
shutd(); pthread_create(&modemth, NULL, modem_io, NULL);
pthread_exit(NULL); pthread_exit(NULL);
return 0; return 0;
} }

40
phoned/modem.c
View file

@ -53,6 +53,7 @@ int modemfd;
unsigned int cou = 0; unsigned int cou = 0;
char buffer[512]; char buffer[512];
short doing_cid = 0; short doing_cid = 0;
pthread_t modemth;
pthread_mutex_t modemmx = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_t modemmx = PTHREAD_MUTEX_INITIALIZER;
pthread_mutex_t buffermx = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_t buffermx = PTHREAD_MUTEX_INITIALIZER;
void stmod(const char* str) void stmod(const char* str)
@ -167,3 +168,42 @@ void modem_hread(char* cbuf)
} }
pthread_mutex_unlock(&buffermx); pthread_mutex_unlock(&buffermx);
} }
void *modem_io(k)
void* k;
{
fd_set fds;
struct timeval tv;
char cbuf[1];
k = 0;
*cbuf = '\0'; cbuf[1] = '\0';
pthread_mutex_lock(&modemmx);
for(;;) {
FD_ZERO(&fds);
FD_SET(modemfd, &fds);
tv.tv_sec = 2; /* tunable */
tv.tv_usec = 0;
switch(select(modemfd + 1, &fds, NULL, NULL, &tv)) {
case -1:
lprintf(error, "select on modem: %s", strerror(errno));
pthread_mutex_unlock(&modemmx);
pthread_exit(NULL);
break;
case 0:
pthread_mutex_unlock(&modemmx);
sleep(1);
pthread_mutex_lock(&modemmx);
break;
default:
{
if(FD_ISSET(modemfd, &fds) != 0) {
read(modemfd, cbuf, 1);
modem_hread(cbuf);
*cbuf = '\0';
}
}
}
}
pthread_mutex_unlock(&modemmx);
pthread_exit(NULL);
return 0;
}

16
phoned/socket.c
View file

@ -47,11 +47,9 @@
#include <phoned.h> #include <phoned.h>
extern int modemfd;
extern FILE* modem;
extern pthread_mutex_t modemmx; extern pthread_mutex_t modemmx;
extern pthread_mutex_t buffermx; extern pthread_mutex_t buffermx;
pthread_t networkth;
void *handclient(k) void *handclient(k)
void* k; void* k;
{ {
@ -82,15 +80,18 @@ void *handclient(k)
return 0; return 0;
} }
void network(void) /* name is misleading because we also do modem IO here */ void *network(b)
void* b;
{ {
int s, /* us,*/ sn; int s, /* us,*/ sn;
fd_set fds; fd_set fds;
int sin_size, ilen; int sin_size, ilen;
pthread_t thr; pthread_t thr;
char cbuf[1]; char cbuf[1];
void* is;
cbuf[0] = '\0'; cbuf[1] = '\0'; cbuf[0] = '\0'; cbuf[1] = '\0';
struct sockaddr_un it; struct sockaddr_un it;
is = b;
if((s = socket(AF_LOCAL, SOCK_STREAM, 0)) == -1) { if((s = socket(AF_LOCAL, SOCK_STREAM, 0)) == -1) {
perror("socket"); perror("socket");
exit(-1); exit(-1);
@ -110,7 +111,6 @@ void network(void) /* name is misleading because we also do modem IO here */
for(;;) { for(;;) {
FD_ZERO(&fds); FD_ZERO(&fds);
FD_SET(s, &fds); FD_SET(s, &fds);
FD_SET(modemfd, &fds);
switch(select(s + 1, &fds, NULL, NULL, NULL)) { switch(select(s + 1, &fds, NULL, NULL, NULL)) {
case -1: case -1:
perror("select"); perror("select");
@ -135,12 +135,6 @@ void network(void) /* name is misleading because we also do modem IO here */
,ilen); ,ilen);
} }
if(FD_ISSET(modemfd, &fds) != 0)
{
read(modemfd, cbuf, 1);
modem_hread(cbuf);
*cbuf = '\0';
}
} }
} }
} }