Dne 10.01.2018 (sre) ob 08:36 +0100 je Georg Chini napisal(a):
> On 09.01.2018 22:24, Samo PogaÄ?nik wrote:
> >
> > Allow usage of an already existing fifo (named pipe) upon module
> > load. Also, the fifo is not going to be removed upon module unload,
> > if "use_existing_fifo" option has been enabled.
> I wonder if we really need a new option for this. Can't you just
> check
> if the file exists and use it if it is present? You could set aÂ
> do_not_unlink
> flag if it exists to avoid removing an already existing file on exit.
I'd be glad to make this change without additional option. My concern
was that there might be some existing use case, where an exclusive fifo
creation would have been required by the sink in some benificial way
(like starting with an empty fifo, however this is not guarantied
anyway).
>
> >
> > ---
> > Â src/modules/module-pipe-sink.c | 17 ++++++++++++++---
> > Â 1 file changed, 14 insertions(+), 3 deletions(-)
> >
> > diff --git a/src/modules/module-pipe-sink.c b/src/modules/module-
> > pipe-sink.c
> > index fe2af70..eafc3f7 100644
> > --- a/src/modules/module-pipe-sink.c
> > +++ b/src/modules/module-pipe-sink.c
> > @@ -62,6 +62,7 @@ PA_MODULE_USAGE(
> > Â Â Â Â Â Â Â Â Â Â "channels=<number of channels> "
> > Â Â Â Â Â Â Â Â Â Â "channel_map=<channel map> "
> > Â Â Â Â Â Â Â Â Â Â "use_system_clock_for_timing=<yes or no> "
> > +Â Â Â Â Â Â Â Â "use_existing_fifo=<yes or no> "
> > Â );
> > Â Â
> > Â #define DEFAULT_FILE_NAME "fifo_output"
> > @@ -91,6 +92,7 @@ struct userdata {
> > Â Â Â Â Â Â pa_usec_t timestamp;
> > Â Â
> > Â Â Â Â Â Â bool use_system_clock_for_timing;
> > +Â Â Â Â bool use_existing_fifo;
> > Â };
> > Â Â
> > Â static const char* const valid_modargs[] = {
> > @@ -102,6 +104,7 @@ static const char* const valid_modargs[] = {
> > Â Â Â Â Â Â "channels",
> > Â Â Â Â Â Â "channel_map",
> > Â Â Â Â Â Â "use_system_clock_for_timing",
> > +Â Â Â Â "use_existing_fifo",
> > Â Â Â Â Â Â NULL
> > Â };
> > Â Â
> > @@ -442,6 +445,11 @@ int pa__init(pa_module *m) {
> > Â Â Â Â Â Â Â Â Â Â goto fail;
> > Â Â Â Â Â Â }
> > Â Â
> > +Â Â Â Â if (pa_modargs_get_value_boolean(ma, "use_existing_fifo", &u-
> > >use_existing_fifo) < 0) {
> > +Â Â Â Â Â Â Â Â pa_log("Failed to parse use_existing_fifo argument.");
> > +Â Â Â Â Â Â Â Â goto fail;
> > +Â Â Â Â }
> > +
> > Â Â Â Â Â Â if (pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u-
> > >rtpoll) < 0) {
> > Â Â Â Â Â Â Â Â Â Â pa_log("pa_thread_mq_init() failed.");
> > Â Â Â Â Â Â Â Â Â Â goto fail;
> > @@ -452,8 +460,10 @@ int pa__init(pa_module *m) {
> > Â Â Â Â Â Â u->filename = pa_runtime_path(pa_modargs_get_value(ma,
> > "file", DEFAULT_FILE_NAME));
> > Â Â
> > Â Â Â Â Â Â if (mkfifo(u->filename, 0666) < 0) {
> > -Â Â Â Â Â Â Â Â pa_log("mkfifo('%s'): %s", u->filename,
> > pa_cstrerror(errno));
> > -Â Â Â Â Â Â Â Â goto fail;
> > +Â Â Â Â Â Â Â Â int errno_save = errno;
> > +Â Â Â Â Â Â Â Â pa_log("mkfifo('%s'): %s", u->filename,
> > pa_cstrerror(errno_save));
> > +Â Â Â Â Â Â Â Â if (!u->use_existing_fifo || errno_save != EEXIST)
> > +Â Â Â Â Â Â Â Â Â Â Â Â goto fail;
> > Â Â Â Â Â Â }
> The log line should be within the if condition. Also, should we not
> makeÂ
> sure that
> the file is a pipe if it exists?
I'll move the log line and the "ISFIFO" check is already present in the
original code a few lines further.
>
> >
> > Â Â Â Â Â Â if ((u->fd = pa_open_cloexec(u->filename, O_RDWR, 0)) < 0) {
> > Â Â Â Â Â Â Â Â Â Â pa_log("open('%s'): %s", u->filename,
> > pa_cstrerror(errno));
> > @@ -584,7 +594,8 @@ void pa__done(pa_module *m) {
> > Â Â Â Â Â Â Â Â Â Â pa_rtpoll_free(u->rtpoll);
> > Â Â
> > Â Â Â Â Â Â if (u->filename) {
> > -Â Â Â Â Â Â Â Â unlink(u->filename);
> > +Â Â Â Â Â Â Â Â if (!u->use_existing_fifo)
> > +Â Â Â Â Â Â Â Â Â Â Â Â unlink(u->filename);
> > Â Â Â Â Â Â Â Â Â Â pa_xfree(u->filename);
> > Â Â Â Â Â Â }
> > Â Â
>
regards, Samo
