From: Andre Noll Date: Tue, 11 Jun 2013 18:41:49 +0000 (+0200) Subject: Merge branch 't/stdin_stdout_fixes' X-Git-Tag: v0.4.13~31 X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=d46a0767b58654f15f16406cf99296287bd0d534;hp=-c Merge branch 't/stdin_stdout_fixes' Was cooking for almost a month. b99b4a stdin/stdout: Restore fd flags on shutdown. Conflicts: stdin.c stdout.c --- d46a0767b58654f15f16406cf99296287bd0d534 diff --combined NEWS index a93fb2e3,f323df1d..07481964 --- a/NEWS +++ b/NEWS @@@ -2,12 -2,6 +2,14 @@@ 0.?.? (to be announced) "spectral gravity" ------------------------------------------ + - UTF8 support for para_gui and the mp3 audio format handler. + - Scheduler improvements and fixes. + - The obsolete gettimeofday() function has been replaced + by clock_gettime() on systems which support it. + - Speed and usability improvements for para_gui. ++ - para_client now restores the fd flags of stdin and stdout ++ on shutdown + ----------------------------------------- 0.4.12 (2012-12-20) "volatile relativity" ----------------------------------------- diff --combined stdin.c index b25a0ba0,08bc1f9a..20b9250e --- a/stdin.c +++ b/stdin.c @@@ -33,6 -33,7 +33,6 @@@ static void stdin_pre_select(struct sch struct stdin_task *sit = container_of(t, struct stdin_task, task); int ret; - t->error = 0; ret = btr_node_status(sit->btrn, 0, BTR_NT_ROOT); if (ret < 0) sched_min_delay(s); @@@ -54,21 -55,28 +54,27 @@@ * appears to be readable, data is read from stdin and fed into the buffer * tree. */ -static void stdin_post_select(struct sched *s, struct task *t) +static int stdin_post_select(struct sched *s, struct task *t) { struct stdin_task *sit = container_of(t, struct stdin_task, task); ssize_t ret; size_t sz, n; char *buf = NULL; - t->error = 0; ret = btr_node_status(sit->btrn, 0, BTR_NT_ROOT); if (ret < 0) goto err; if (ret == 0) - return; + return 0; sz = btr_pool_get_buffer(sit->btrp, &buf); if (sz == 0) - return; + return 0; + if (sit->must_set_nonblock_flag) { + ret = mark_fd_nonblocking(STDIN_FILENO); + if (ret < 0) + goto err; + sit->must_set_nonblock_flag = false; + } /* * Do not use the maximal size to avoid having only a single buffer * reference for the whole pool. This is bad because if that single @@@ -79,11 -87,13 +85,13 @@@ if (n > 0) btr_add_output_pool(sit->btrp, n, sit->btrn); if (ret >= 0) - return; + return 0; err: btr_remove_node(&sit->btrn); + /* Revert to blocking mode if necessary. */ + fcntl(STDIN_FILENO, F_SETFL, sit->fd_flags); //btr_pool_free(sit->btrp); - t->error = ret; + return ret; } /** @@@ -92,8 -102,7 +100,7 @@@ * \param sit The stdin task structure. * * This fills in the pre/post select function pointers of the task structure - * given by \a sit. Moreover, the stdin file desctiptor is set to nonblocking - * mode, and a buffer tree is created. + * given by \a sit and creates a buffer tree for I/O. */ void stdin_set_defaults(struct stdin_task *sit) { @@@ -103,9 -112,18 +110,18 @@@ sit->task.post_select = stdin_post_select; sit->btrp = btr_pool_new("stdin", 128 * 1024); sprintf(sit->task.status, "stdin reader"); - ret = mark_fd_nonblocking(STDIN_FILENO); - if (ret >= 0) - return; - PARA_EMERG_LOG("%s\n", para_strerror(-ret)); - exit(EXIT_FAILURE); + /* + * Both STDIN_FILENO and STDOUT_FILENO may refer to the same open file + * description (the terminal), and thus share the same file status + * flags. In order to not interfere with the stdout task, we only get + * the file status flags for STDIN here and save a copy. The nonblock + * flag is set later on the first read. + */ + ret = fcntl(STDIN_FILENO, F_GETFL); + if (ret < 0) { + PARA_EMERG_LOG("F_GETFL: %s\n", strerror(errno)); + exit(EXIT_FAILURE); + } + sit->fd_flags = ret; + sit->must_set_nonblock_flag = (sit->fd_flags & O_NONBLOCK) == 0; } diff --combined stdout.c index abf3d06f,0cf4876d..cf33bf6d --- a/stdout.c +++ b/stdout.c @@@ -30,6 -30,7 +30,6 @@@ static void stdout_pre_select(struct sc struct stdout_task *sot = container_of(t, struct stdout_task, task); int ret; - t->error = 0; ret = btr_node_status(sot->btrn, 0, BTR_NT_LEAF); if (ret > 0) para_fd_set(STDOUT_FILENO, &s->wfds, &s->max_fileno); @@@ -46,7 -47,7 +46,7 @@@ * This function writes input data from the buffer tree to stdout if \p * STDOUT_FILENO is writable. */ -static void stdout_post_select(struct sched *s, struct task *t) +static int stdout_post_select(struct sched *s, struct task *t) { struct stdout_task *sot = container_of(t, struct stdout_task, task); struct btr_node *btrn = sot->btrn; @@@ -54,14 -55,21 +54,20 @@@ char *buf; size_t sz; - t->error = 0; ret = btr_node_status(btrn, 0, BTR_NT_LEAF); if (ret < 0) goto out; if (ret == 0) - return; + return 0; if (!FD_ISSET(STDOUT_FILENO, &s->wfds)) - return; + return 0; + if (sot->must_set_nonblock_flag) { + ret = mark_fd_nonblocking(STDOUT_FILENO); + if (ret < 0) + goto out; + sot->must_set_nonblock_flag = false; + } for (;;) { sz = btr_next_buffer(btrn, &buf); if (sz == 0) @@@ -72,9 -80,12 +78,12 @@@ btr_consume(btrn, ret); } out: - if (ret < 0) + if (ret < 0) { btr_remove_node(&sot->btrn); + /* Revert to blocking mode if necessary. */ + fcntl(STDOUT_FILENO, F_SETFL, sot->fd_flags); + } - t->error = ret; + return ret; } /** * Initialize a stdout task structure with default values. @@@ -82,7 -93,7 +91,7 @@@ * \param sot The stdout task structure. * * This fills in the pre/post select function pointers of the task structure - * given by \a sot and sets the stdout file descriptor to nonblocking mode. + * given by \a sot. */ void stdout_set_defaults(struct stdout_task *sot) { @@@ -91,9 -102,13 +100,13 @@@ sot->task.pre_select = stdout_pre_select; sot->task.post_select = stdout_post_select; sprintf(sot->task.status, "stdout"); - ret = mark_fd_nonblocking(STDOUT_FILENO); - if (ret >= 0) - return; - PARA_EMERG_LOG("%s\n", para_strerror(-ret)); - exit(EXIT_FAILURE); + + /* See stdin.c for details. */ + ret = fcntl(STDOUT_FILENO, F_GETFL); + if (ret < 0) { + PARA_EMERG_LOG("F_GETFL: %s\n", strerror(errno)); + exit(EXIT_FAILURE); + } + sot->fd_flags = ret; + sot->must_set_nonblock_flag = (sot->fd_flags & O_NONBLOCK) == 0; }