steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

read line fix

cvs
Slava Pestov 2004-08-20 00:09:26 +00:00
parent 0ad8cb57d7
commit 4d1f07f53f
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
native/iomux.c
View File

@ -111,6 +111,8 @@ bool set_up_fd_set(fd_set* fdset, int fd_count, IO_TASK* io_tasks)
bool perform_read_line_io_task(PORT* port) bool perform_read_line_io_task(PORT* port)
{ {
SBUF* line;
if(port->buf_pos >= port->buf_fill) if(port->buf_pos >= port->buf_fill)
{ {
if(!read_step(port)) if(!read_step(port))
@ -120,7 +122,12 @@ bool perform_read_line_io_task(PORT* port)
if(port->buf_fill == 0) if(port->buf_fill == 0)
{ {
/* EOF */ /* EOF */
if(port->line != F)
{
line = untag_sbuf(port->line);
if(line->top == 0)
port->line = F; port->line = F;
}
port->line_ready = true; port->line_ready = true;
return true; return true;
} }
@ -130,6 +137,11 @@ bool perform_read_line_io_task(PORT* port)
} }
} }
bool perform_read_count_io_task(PORT* port)
{
return false;
}
bool perform_write_io_task(PORT* port) bool perform_write_io_task(PORT* port)
{ {
if(write_step(port)) if(write_step(port))
@ -149,6 +161,7 @@ CELL perform_io_task(IO_TASK* task)
{ {
PORT* port = untag_port(task->port); PORT* port = untag_port(task->port);
CELL callback = task->callback; CELL callback = task->callback;
switch(task->type) switch(task->type)
{ {
case IO_TASK_READ_LINE: case IO_TASK_READ_LINE:
@ -163,6 +176,18 @@ CELL perform_io_task(IO_TASK* task)
&read_fd_count); &read_fd_count);
return F; return F;
} }
case IO_TASK_READ_COUNT:
remove_io_task(IO_TASK_READ_COUNT,port,
read_io_tasks,&read_fd_count);
if(perform_read_count_io_task(port))
return callback;
else
{
add_io_task(IO_TASK_READ_COUNT,port,
callback,read_io_tasks,
&read_fd_count);
return F;
}
case IO_TASK_WRITE: case IO_TASK_WRITE:
remove_io_task(IO_TASK_WRITE,port, remove_io_task(IO_TASK_WRITE,port,
write_io_tasks,&write_fd_count); write_io_tasks,&write_fd_count);