hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

implemented partial closing for rwpipe

Browse Source
This commit is contained in:
hyung-hwan 2009-08-28 06:52:20 +00:00
parent 9d635709f3
commit 81b3d369e8
6 changed files with 116 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qse/doc/page/awk.doc
View File

@ -60,7 +60,7 @@ BEGIN {
print "11" || "sort"; print "11" || "sort";
#close the input as sort emits when the input is closed #close the input as sort emits when the input is closed
close ("sort", "r"); close ("sort", "r");
while (("sort" || getline x) > 0) print x; while (("sort" || getline x) > 0) print "xx:", x;
} }
@endcode @endcode

21
qse/include/qse/awk/awk.h
View File

@ -1,5 +1,5 @@
/* /*
* $Id: awk.h 270 2009-08-26 12:59:08Z hyunghwan.chung $ * $Id: awk.h 271 2009-08-27 12:52:20Z hyunghwan.chung $
* *
Copyright 2006-2009 Chung, Hyung-Hwan. Copyright 2006-2009 Chung, Hyung-Hwan.
@ -351,11 +351,13 @@ enum qse_awk_rio_mode_t
}; };
typedef enum qse_awk_rio_mode_t qse_awk_rio_mode_t; typedef enum qse_awk_rio_mode_t qse_awk_rio_mode_t;
enum qse_awk_rio_close_opt_t enum qse_awk_rio_rwcopt_t
{ {
QSE_AWK_RIO_CLOSE_R = (1 << 0), QSE_AWK_RIO_CLOSE_A = 0,
QSE_AWK_RIO_CLOSE_W = (1 << 1) QSE_AWK_RIO_CLOSE_R = 1,
QSE_AWK_RIO_CLOSE_W = 2
}; };
typedef enum qse_awk_rio_rwcopt_t qse_awk_rio_rwcopt_t;
/** /**
* The qse_awk_rio_arg_t defines the data structure passed to a runtime * The qse_awk_rio_arg_t defines the data structure passed to a runtime
@ -369,25 +371,26 @@ struct qse_awk_rio_arg_t
{ {
qse_awk_rio_mode_t mode; /**< [IN] I/O mode */ qse_awk_rio_mode_t mode; /**< [IN] I/O mode */
qse_char_t* name; /**< [IN] name of I/O object */ qse_char_t* name; /**< [IN] name of I/O object */
int copt; /**< [IN] closing option */ qse_awk_rio_rwcopt_t rwcopt; /**< [IN] closing option for rwpipe */
void* handle; /**< [OUT] I/O handle set by a handler */ void* handle; /**< [OUT] I/O handle set by a handler */
/*-- from here down, internal use only --*/ /*-- from here down, internal use only --*/
int type; int type;
int rwcstate; /** closing state for rwpipe */
struct struct
{ {
qse_char_t buf[2048]; qse_char_t buf[2048];
qse_size_t pos; qse_size_t pos;
qse_size_t len; qse_size_t len;
qse_bool_t eof; int eof;
qse_bool_t eos; int eos;
} in; } in;
struct struct
{ {
qse_bool_t eof; int eof;
qse_bool_t eos; int eos;
} out; } out;
struct qse_awk_rio_arg_t* next; struct qse_awk_rio_arg_t* next;

23
qse/lib/awk/StdAwk.cpp
View File

@ -1,5 +1,5 @@
/* /*
* $Id: StdAwk.cpp 258 2009-08-19 14:04:15Z hyunghwan.chung $ * $Id: StdAwk.cpp 271 2009-08-27 12:52:20Z hyunghwan.chung $
* *
Copyright 2006-2009 Chung, Hyung-Hwan. Copyright 2006-2009 Chung, Hyung-Hwan.
@ -315,7 +315,26 @@ int StdAwk::openPipe (Pipe& io)
int StdAwk::closePipe (Pipe& io) int StdAwk::closePipe (Pipe& io)
{ {
qse_pio_close ((qse_pio_t*)io.getHandle()); qse_pio_t* pio = (qse_pio_t*)io.getHandle();
if (io.getMode() == Awk::Pipe::RW)
{
#if 0
TODO: support partial close....
rwcopt = io.getCloseRW();
if (rwcopt == Awk::Pipe::CLOSE_R)
{
qse_pio_end (pio, QSE_PIO_IN);
return 0;
}
else if (rwcopt == Awk::Pipe::CLOSE_W)
{
qse_pio_end (pio, QSE_PIO_OUT);
return 0;
}
#endif
}
qse_pio_close (pio);
return 0; return 0;
} }

2
qse/lib/awk/fnc.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: fnc.c 270 2009-08-26 12:59:08Z hyunghwan.chung $ * $Id: fnc.c 271 2009-08-27 12:52:20Z hyunghwan.chung $
* *
Copyright 2006-2009 Chung, Hyung-Hwan. Copyright 2006-2009 Chung, Hyung-Hwan.

75
qse/lib/awk/rio.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: rio.c 270 2009-08-26 12:59:08Z hyunghwan.chung $ * $Id: rio.c 271 2009-08-27 12:52:20Z hyunghwan.chung $
* *
Copyright 2006-2009 Chung, Hyung-Hwan. Copyright 2006-2009 Chung, Hyung-Hwan.
@ -148,14 +148,16 @@ int qse_awk_rtx_readio (
p->type = (io_type | io_mask); p->type = (io_type | io_mask);
p->mode = io_mode; p->mode = io_mode;
p->rwcopt = QSE_AWK_RIO_CLOSE_A;
p->handle = QSE_NULL; p->handle = QSE_NULL;
p->next = QSE_NULL; p->next = QSE_NULL;
p->rwcstate = 0;
p->in.buf[0] = QSE_T('\0'); p->in.buf[0] = QSE_T('\0');
p->in.pos = 0; p->in.pos = 0;
p->in.len = 0; p->in.len = 0;
p->in.eof = QSE_FALSE; p->in.eof = 0;
p->in.eos = QSE_FALSE; p->in.eos = 0;
qse_awk_rtx_seterrnum (run, QSE_AWK_ENOERR, QSE_NULL); qse_awk_rtx_seterrnum (run, QSE_AWK_ENOERR, QSE_NULL);
@ -187,7 +189,7 @@ int qse_awk_rtx_readio (
* entire pattern-block matching and exeuction. */ * entire pattern-block matching and exeuction. */
if (x == 0) if (x == 0)
{ {
p->in.eos = QSE_TRUE; p->in.eos = 1;
return 0; return 0;
} }
} }
@ -259,7 +261,7 @@ int qse_awk_rtx_readio (
if (n == 0) if (n == 0)
{ {
p->in.eof = QSE_TRUE; p->in.eof = 1;
if (QSE_STR_LEN(buf) == 0) ret = 0; if (QSE_STR_LEN(buf) == 0) ret = 0;
else if (rs_len >= 2) else if (rs_len >= 2)
@ -507,11 +509,13 @@ int qse_awk_rtx_writeio_str (
p->type = (io_type | io_mask); p->type = (io_type | io_mask);
p->mode = io_mode; p->mode = io_mode;
p->rwcopt = QSE_AWK_RIO_CLOSE_A;
p->handle = QSE_NULL; p->handle = QSE_NULL;
p->next = QSE_NULL; p->next = QSE_NULL;
p->rwcstate = 0;
p->out.eof = QSE_FALSE; p->out.eof = 0;
p->out.eos = QSE_FALSE; p->out.eos = 0;
qse_awk_rtx_seterrnum (run, QSE_AWK_ENOERR, QSE_NULL); qse_awk_rtx_seterrnum (run, QSE_AWK_ENOERR, QSE_NULL);
n = handler (run, QSE_AWK_RIO_OPEN, p, QSE_NULL, 0); n = handler (run, QSE_AWK_RIO_OPEN, p, QSE_NULL, 0);
@ -537,7 +541,7 @@ int qse_awk_rtx_writeio_str (
* entire pattern-block matching and exeuction. */ * entire pattern-block matching and exeuction. */
if (n == 0) if (n == 0)
{ {
p->out.eos = QSE_TRUE; p->out.eos = 1;
return 0; return 0;
} }
} }
@ -569,7 +573,7 @@ int qse_awk_rtx_writeio_str (
if (n == 0) if (n == 0)
{ {
p->out.eof = QSE_TRUE; p->out.eof = 1;
return 0; return 0;
} }
@ -587,7 +591,7 @@ int qse_awk_rtx_flushio (
qse_awk_rio_fun_t handler; qse_awk_rio_fun_t handler;
int io_type, /*io_mode,*/ io_mask; int io_type, /*io_mode,*/ io_mask;
qse_ssize_t n; qse_ssize_t n;
qse_bool_t ok = QSE_FALSE; int ok = 0;
QSE_ASSERT (out_type >= 0 && out_type <= QSE_COUNTOF(out_type_map)); QSE_ASSERT (out_type >= 0 && out_type <= QSE_COUNTOF(out_type_map));
QSE_ASSERT (out_type >= 0 && out_type <= QSE_COUNTOF(out_mode_map)); QSE_ASSERT (out_type >= 0 && out_type <= QSE_COUNTOF(out_mode_map));
@ -622,7 +626,7 @@ int qse_awk_rtx_flushio (
return -1; return -1;
} }
ok = QSE_TRUE; ok = 1;
} }
p = p->next; p = p->next;
@ -696,14 +700,14 @@ int qse_awk_rtx_nextio_read (
/* the next stream cannot be opened. /* the next stream cannot be opened.
* set the eos flags so that the next call to nextio_read * set the eos flags so that the next call to nextio_read
* will return 0 without executing the handler */ * will return 0 without executing the handler */
p->in.eos = QSE_TRUE; p->in.eos = 1;
return 0; return 0;
} }
else else
{ {
/* as the next stream has been opened successfully, /* as the next stream has been opened successfully,
* the eof flag should be cleared if set */ * the eof flag should be cleared if set */
p->in.eof = QSE_FALSE; p->in.eof = 0;
/* also the previous input buffer must be reset */ /* also the previous input buffer must be reset */
p->in.pos = 0; p->in.pos = 0;
@ -774,14 +778,14 @@ int qse_awk_rtx_nextio_write (
/* the next stream cannot be opened. /* the next stream cannot be opened.
* set the eos flags so that the next call to nextio_write * set the eos flags so that the next call to nextio_write
* will return 0 without executing the handler */ * will return 0 without executing the handler */
p->out.eos = QSE_TRUE; p->out.eos = 1;
return 0; return 0;
} }
else else
{ {
/* as the next stream has been opened successfully, /* as the next stream has been opened successfully,
* the eof flag should be cleared if set */ * the eof flag should be cleared if set */
p->out.eof = QSE_FALSE; p->out.eof = 0;
return 1; return 1;
} }
} }
@ -916,19 +920,37 @@ int qse_awk_rtx_closeio (
if (qse_strcmp (p->name, name) == 0) if (qse_strcmp (p->name, name) == 0)
{ {
qse_awk_rio_fun_t handler; qse_awk_rio_fun_t handler;
int copt = QSE_AWK_RIO_CLOSE_R | QSE_AWK_RIO_CLOSE_W; qse_awk_rio_rwcopt_t rwcopt = QSE_AWK_RIO_CLOSE_A;
if (opt != QSE_NULL) if (opt != QSE_NULL)
{ {
if (opt[0] == QSE_T('r')) if (opt[0] == QSE_T('r'))
{ {
if (p->type & MASK_RDWR) copt = QSE_AWK_RIO_CLOSE_R; if (p->type & MASK_RDWR)
{
if (p->rwcstate != QSE_AWK_RIO_CLOSE_W)
{
/* if the write end is not
* closed, let io handler close
* the read end only. */
rwcopt = QSE_AWK_RIO_CLOSE_R;
}
}
else if (!(p->type & MASK_READ)) goto skip; else if (!(p->type & MASK_READ)) goto skip;
} }
else else
{ {
QSE_ASSERT (opt[0] == QSE_T('w')); QSE_ASSERT (opt[0] == QSE_T('w'));
if (p->type & MASK_RDWR) copt = QSE_AWK_RIO_CLOSE_W; if (p->type & MASK_RDWR)
{
if (p->rwcstate != QSE_AWK_RIO_CLOSE_R)
{
/* if the read end is not
* closed, let io handler close
* the write end only. */
rwcopt = QSE_AWK_RIO_CLOSE_W;
}
}
else if (!(p->type & MASK_WRITE)) goto skip; else if (!(p->type & MASK_WRITE)) goto skip;
} }
} }
@ -937,7 +959,7 @@ int qse_awk_rtx_closeio (
if (handler != QSE_NULL) if (handler != QSE_NULL)
{ {
qse_awk_rtx_seterrnum (rtx, QSE_AWK_ENOERR, QSE_NULL); qse_awk_rtx_seterrnum (rtx, QSE_AWK_ENOERR, QSE_NULL);
p->copt = copt; p->rwcopt = rwcopt;
if (handler (rtx, QSE_AWK_RIO_CLOSE, p, QSE_NULL, 0) <= -1) if (handler (rtx, QSE_AWK_RIO_CLOSE, p, QSE_NULL, 0) <= -1)
{ {
/* this is not a run-time error.*/ /* this is not a run-time error.*/
@ -946,12 +968,20 @@ int qse_awk_rtx_closeio (
return -1; return -1;
} }
} }
/* TODO:
if (p->type & MASK_RDWR) if (p->type & MASK_RDWR)
{ {
if partially closed don't destroy it yet... p->rwcopt = rwcopt;
if (p->rwcstate == 0 && rwcopt != 0)
{
/* if either end has not been closed.
* return success without destroying
* the internal node. rwcstate keeps
* what has been successfully closed */
p->rwcstate = rwcopt;
return 0;
}
} }
*/
if (px != QSE_NULL) px->next = p->next; if (px != QSE_NULL) px->next = p->next;
else rtx->rio.chain = p->next; else rtx->rio.chain = p->next;
@ -986,6 +1016,7 @@ void qse_awk_rtx_cleario (qse_awk_rtx_t* run)
if (handler != QSE_NULL) if (handler != QSE_NULL)
{ {
qse_awk_rtx_seterrnum (run, QSE_AWK_ENOERR, QSE_NULL); qse_awk_rtx_seterrnum (run, QSE_AWK_ENOERR, QSE_NULL);
run->rio.chain->rwcopt = 0;
n = handler (run, QSE_AWK_RIO_CLOSE, run->rio.chain, QSE_NULL, 0); n = handler (run, QSE_AWK_RIO_CLOSE, run->rio.chain, QSE_NULL, 0);
if (n <= -1) if (n <= -1)
{ {

22
qse/lib/awk/std.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: std.c 258 2009-08-19 14:04:15Z hyunghwan.chung $ * $Id: std.c 271 2009-08-27 12:52:20Z hyunghwan.chung $
* *
Copyright 2006-2009 Chung, Hyung-Hwan. Copyright 2006-2009 Chung, Hyung-Hwan.
@ -619,7 +619,25 @@ static qse_ssize_t awk_rio_pipe (
case QSE_AWK_RIO_CLOSE: case QSE_AWK_RIO_CLOSE:
{ {
qse_pio_close ((qse_pio_t*)riod->handle); qse_pio_t* pio = (qse_pio_t*)riod->handle;
if (riod->mode == QSE_AWK_RIO_PIPE_RW)
{
/* specialy treatment is needef for rwpipe.
* inspect rwcopt to see if partial closing is
* requested. */
if (riod->rwcopt == QSE_AWK_RIO_CLOSE_R)
{
qse_pio_end (pio, QSE_PIO_IN);
return 0;
}
else if (riod->rwcopt == QSE_AWK_RIO_CLOSE_W)
{
qse_pio_end (pio, QSE_PIO_OUT);
return 0;
}
}
qse_pio_close (pio);
riod->handle = QSE_NULL; riod->handle = QSE_NULL;
return 0; return 0;
} }