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

Modem is now threaded properly, I think.

Browse source
This commit is contained in:
dcp1990 2005-06-13 03:40:36 +00:00
parent 0f2ffadd48
commit a0fd36072c
2 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
phoned/modem.c
View file

@ -56,8 +56,23 @@ short doing_cid = 0;
extern struct conf cf; extern struct conf cf;
pthread_t modemth; pthread_t modemth;
pthread_mutex_t modemmx = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_t modemmx = PTHREAD_MUTEX_INITIALIZER;
pthread_mutex_t mpipemx = PTHREAD_MUTEX_INITIALIZER;
pthread_mutex_t buffermx = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_t buffermx = PTHREAD_MUTEX_INITIALIZER;
pthread_cond_t mpcond = PTHREAD_COND_INITIALIZER;
int modempipes[2];
extern pthread_mutex_t cfmx; extern pthread_mutex_t cfmx;
void give_me_modem(str)
char* str;
{
pthread_mutex_lock(&mpipemx);
write(modempipes[1], "G", 1);
pthread_mutex_unlock(&mpipemx);
pthread_mutex_lock(&modemmx);
fputs(str, modem);
fflush(modem);
pthread_cond_signal(&mpcond);
pthread_mutex_unlock(&modemmx);
}
void stmod(const char* str) void stmod(const char* str)
{ {
pthread_mutex_lock(&modemmx); pthread_mutex_lock(&modemmx);
@ -183,20 +198,24 @@ void *modem_io(k)
{ {
fd_set fds; fd_set fds;
struct timeval tv; struct timeval tv;
char cbuf[1]; char cbuf[2];
short dotm = 0; short dotm = 0;
k = 0; k = 0;
*cbuf = '\0'; cbuf[1] = '\0'; *cbuf = '\0'; cbuf[1] = '\0';
pthread_mutex_lock(&mpipemx);
pipe(modempipes);
pthread_mutex_unlock(&mpipemx);
pthread_mutex_lock(&modemmx); pthread_mutex_lock(&modemmx);
for(;;) { for(;;) {
pthread_mutex_lock(&cfmx); pthread_mutex_lock(&cfmx);
dotm = cf.modem_tm; /* dotm = cf.modem_tm; */
pthread_mutex_unlock(&cfmx); pthread_mutex_unlock(&cfmx);
FD_ZERO(&fds); FD_ZERO(&fds);
FD_SET(modemfd, &fds); FD_SET(modemfd, &fds);
tv.tv_sec = 2; /* tunable */ FD_SET(modempipes[0], &fds);
tv.tv_usec = 0; /* tv.tv_sec = 2; tunable */
switch(select(modemfd + 1, &fds, NULL, NULL, dotm ? &tv : NULL)) { /* tv.tv_usec = 0; */
switch(select(modempipes[0] + 1, &fds, NULL, NULL, /* dotm ? &tv :*/ NULL)) {
case -1: case -1:
lprintf(error, "select on modem: %s", strerror(errno)); lprintf(error, "select on modem: %s", strerror(errno));
pthread_mutex_unlock(&modemmx); pthread_mutex_unlock(&modemmx);
@ -214,6 +233,10 @@ void *modem_io(k)
modem_hread(cbuf); modem_hread(cbuf);
*cbuf = '\0'; *cbuf = '\0';
} }
if(FD_ISSET(modempipes[0], &fds) != 0) {
read(modempipes[0], cbuf, 1);
pthread_cond_wait(&mpcond, &modemmx);
}
} }
} }
} }

2
phoned/socket.c
View file

@ -74,6 +74,8 @@ void *handclient(k)
lprintf(info, "nam=%s;month=%d\n", rc->name, rc->month); lprintf(info, "nam=%s;month=%d\n", rc->name, rc->month);
cid_notify(rc); cid_notify(rc);
cid_log(rc); cid_log(rc);
} else if(strcmp(buffer, "gmm") == 0) {
give_me_modem("AT\r\n");
} }
close(sk); close(sk);
pthread_exit(NULL); pthread_exit(NULL);