diff --git a/write.c b/write.c
index 2ea9d21..453824a 100644 (file)
--- a/write.c
+++ b/write.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
@@ -8,8 +8,6 @@

#include <regex.h>
#include <sys/types.h>
-#include <dirent.h>
-#include <stdbool.h>

#include "para.h"
#include "string.h"
#include "write_common.h"
#include "fd.h"
#include "error.h"
+#include "version.h"
+#include "check_wav.h"

INIT_WRITE_ERRLISTS;

-enum check_wav_state {
-};
-
-/* Information extracted from the wav header. */
-       int state;
-       /** Number of channels. */
-       unsigned channels;
-       unsigned sample_format;
-       /** Sample rate specified in wav header given by \a buf. */
-       unsigned sample_rate;
-       /** The task structure used by the scheduler. */
-       struct btr_node *btrn;
-       size_t min_iqs;
-};
-
static struct write_args_info conf;

-/** Length of a standard wav header. */
-
-static void check_wav_pre_select(struct sched *s, struct task *t)
-{
-       int ret;
-
-       ret = btr_node_status(cwt->btrn, cwt->min_iqs, BTR_NT_INTERNAL);
-       if (ret != 0)
-               sched_min_delay(s);
-}
-
-#define HANDLE_EXEC(_cmd) \
-       if (!strcmp(cmd, #_cmd)) { \
-               if (!conf._cmd ## _given && cwt->state == CWS_NEED_HEADER) \
-                       return -E_BTR_NAVAIL; \
-               *result = make_message("%d", cwt->state == CWS_NO_HEADER || conf._cmd ## _given? \
-                       conf._cmd ## _arg : cwt->_cmd); \
-               return 1; \
-       } \
-
-
-static int check_wav_exec(struct btr_node *btrn, const char *cmd, char **result)
-{
-       struct check_wav_task *cwt = btr_context(btrn);
-
-       HANDLE_EXEC(sample_rate);
-       HANDLE_EXEC(channels);
-       HANDLE_EXEC(sample_format);
-       return -ERRNO_TO_PARA_ERROR(ENOTSUP);
-}
-
-static void check_wav_post_select(__a_unused struct sched *s, struct task *t)
-{
-       struct btr_node *btrn = cwt->btrn;
-       unsigned char *a;
-       size_t sz;
-       int ret;
-       uint16_t bps; /* bits per sample */
-       const char *sample_formats[] = {SAMPLE_FORMATS};
-
-       t->error = 0;
-       ret = btr_node_status(btrn, cwt->min_iqs, BTR_NT_INTERNAL);
-       if (ret <= 0)
-               goto out;
-               goto pushdown;
-       btr_merge(btrn, cwt->min_iqs);
-       sz = btr_next_buffer(btrn, (char **)&a);
-       if (sz < cwt->min_iqs) /* file size less than WAV_HEADER_SIZE */
-               goto pushdown;
-       cwt->min_iqs = 0;
-       /*
-        * The default byte ordering assumed for WAVE data files is
-        * little-endian. Files written using the big-endian byte ordering
-        * scheme have the identifier RIFX instead of RIFF.
-        */
-       if (a != 'R' || a != 'I' || a != 'F' ||
-                       (a != 'F' && a != 'X')) {
-               sprintf(t->status, "check wav: no header");
-               goto out;
-       }
-       sprintf(t->status, "check wav: have header");
-       cwt->channels = (unsigned) a;
-       cwt->sample_rate = a + (a << 8) + (a << 16) + (a << 24);
-       bps = a + ((unsigned)a << 8);
-       if (bps != 8 && bps != 16) {
-               PARA_WARNING_LOG("%u bps not supported, assuming 16\n", bps);
-               bps = 16;
-       }
-       /*
-        * 8-bit samples are stored as unsigned bytes, ranging from 0 to 255.
-        * 16-bit samples are stored as 2's-complement signed integers, ranging
-        * from -32768 to 32767.
-        */
-       if (bps == 8)
-               cwt->sample_format = SF_U8;
-       else
-               cwt->sample_format = (a == 'F')? SF_S16_LE : SF_S16_BE;
-       PARA_NOTICE_LOG("%dHz, %s, %s\n", cwt->sample_rate,
-               cwt->channels == 1? "mono" : "stereo",
-               sample_formats[cwt->sample_format]);
-pushdown:
-       btr_pushdown(btrn);
-out:
-       t->error = ret;
-       if (ret < 0)
-               btr_remove_node(btrn);
-}
-
static int loglevel;
INIT_STDERR_LOGGING(loglevel)

@@ -165,62 +48,89 @@ __noreturn static void print_help_and_die(void)
exit(0);
}

-static int main_btr(struct sched *s)
+/*
+ * Parse config and register a task for a writer node.
+ *
+ * \param arg Command line arguments.
+ * \param parent The new node will be a child of \a parent.
+ * \param wn The writer node.
+ *
+ * If arg is \p NULL, the OS-dependent default writer is used with no
+ * arguments.  The default writers are alsa for Linux, osx for OS X, oss for
+ * *BSD, and the file writer if the default writer is not supported.
+ *
+ * Once the writer configuration has been retrieved from the ->parse_config
+ * callback a writer node is created, its buffer tree node is added to the
+ * buffer tree as a child of the given parent.
+ *
+ * Finally, the new writer node's task structure is initialized and registered
+ * to the paraslash scheduler.
+ *
+ * \return Standard.
+ */
+static void setup_writer_node(const char *arg, struct btr_node *parent,
+               struct writer_node *wn, struct sched *s)
+{
+       wn->conf = check_writer_arg_or_die(arg, &wn->writer_num);
+       register_writer_node(wn, parent, s);
+}
+
+static int setup_and_schedule(void)
{
int i, ret;
-       struct check_wav_task _cwt, *cwt = &_cwt;
+       struct btr_node *cwt_btrn;
struct writer_node *wns;
+       static struct sched s;
+       struct wav_params wp;

loglevel = get_loglevel_by_name(conf.loglevel_arg);
sit.btrn = btr_new_node(&(struct btr_node_description)
EMBRACE(.name = "stdin"));
stdin_set_defaults(&sit);
-
-       cwt->btrn = btr_new_node(&(struct btr_node_description)
-               EMBRACE(.name = "check_wav", .parent = sit.btrn,
-               .handler = check_wav_exec, .context = cwt));
-
-       ret = -E_WRITE_SYNTAX;
+
+       COPY_WAV_PARMS(&wp, &conf);
+       cwt = check_wav_init(&s, sit.btrn, &wp, &cwt_btrn);
if (!conf.writer_given) {
-               i = 0;
wns = para_calloc(sizeof(*wns));
-               ret = setup_writer_node(NULL, cwt->btrn, wns);
-               if (ret < 0)
-                       goto out;
+               setup_writer_node(NULL, cwt_btrn, wns, &s);
i = 1;
} else {
wns = para_calloc(conf.writer_given * sizeof(*wns));
-               for (i = 0; i < conf.writer_given; i++) {
-                       ret = setup_writer_node(conf.writer_arg[i],
-                               cwt->btrn, wns + i);
-                       if (ret < 0)
-                               goto out;
-               }
+               for (i = 0; i < conf.writer_given; i++)
+                       setup_writer_node(conf.writer_arg[i], cwt_btrn,
+                               wns + i, &s);
}

-       s->default_timeout.tv_sec = 10;
-       s->default_timeout.tv_usec = 50000;
-       ret = schedule(s);
-out:
+       s.default_timeout.tv_sec = 10;
+       s.default_timeout.tv_usec = 50000;
+       ret = schedule(&s);
+       if (ret >= 0) {
+               int j;
+               for (j = 0; j < i; j++) {
+                       assert(t->error < 0);
+                       if (t->error != -E_WRITE_COMMON_EOF
+                                       && t->error != -E_BTR_EOF) {
+                               PARA_ERROR_LOG("%s: %s\n", t->status,
+                                       para_strerror(-t->error));
+                               if (ret >= 0)
+                                       ret = t->error;
+                       }
+               }
+       }
for (i--; i >= 0; i--) {
struct writer_node *wn = wns + i;
struct writer *w = writers + wn->writer_num;

w->close(wn);
-               btr_free_node(wn->btrn);
+               btr_remove_node(&wn->btrn);
w->free_config(wn->conf);
free(wn->conf);
}
free(wns);
-       btr_free_node(cwt->btrn);
+       check_wav_shutdown(cwt);
return ret;
}

@@ -237,8 +147,7 @@ out:
*/
int main(int argc, char *argv[])
{
-       int ret = -E_WRITE_SYNTAX;
-       static struct sched s;
+       int ret;

writer_init();
write_cmdline_parser(argc, argv, &conf);
@@ -246,7 +155,7 @@ int main(int argc, char *argv[])
if (conf.help_given || conf.detailed_help_given)
print_help_and_die();

-       ret = main_btr(&s);
+       ret = setup_and_schedule();
if (ret < 0) {
PARA_ERROR_LOG("%s\n", para_strerror(-ret));
exit(EXIT_FAILURE);
{"ft_lang_label":"__label__en","ft_lang_prob":0.5146798,"math_prob":0.87331545,"size":7626,"snap":"2020-24-2020-29","text_gpt3_token_len":2478,"char_repetition_ratio":0.13251115,"word_repetition_ratio":0.04978541,"special_character_ratio":0.37713087,"punctuation_ratio":0.23459716,"nsfw_num_words":0,"has_unicode_error":false,"math_prob_llama3":0.9569303,"pos_list":[0],"im_url_duplicate_count":[null],"WARC_HEADER":"{\"WARC-Type\":\"response\",\"WARC-Date\":\"2020-07-16T01:12:43Z\",\"WARC-Record-ID\":\"<urn:uuid:cd188b8c-b156-4328-be9c-e7d5cf4eff33>\",\"Content-Length\":\"41399\",\"Content-Type\":\"application/http; msgtype=response\",\"WARC-Warcinfo-ID\":\"<urn:uuid:23e25386-5de6-4d2c-a105-7939f8736356>\",\"WARC-Concurrent-To\":\"<urn:uuid:4e79dd46-4cde-4f4a-a527-ee739ee676bc>\",\"WARC-IP-Address\":\"192.124.27.42\",\"WARC-Target-URI\":\"http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff;f=write.c;h=453824ace679f97feaa24c0d74b61ebdd83b049f;hp=2ea9d2132bee5f64224f3f9d635af8f83777a33e;hb=1af65c31171b35e5a5e931e3a4467786e932e145;hpb=dd98d31d017bbbe16bf6711e0343b267dd6cfe89\",\"WARC-Payload-Digest\":\"sha1:U5GLMPR7E4XAQPJ3RYBT4FNZL2FEX2VA\",\"WARC-Block-Digest\":\"sha1:TT2PHUGRLVP2YRGCU42C5E3JHIFJAW6T\",\"WARC-Identified-Payload-Type\":\"application/xhtml+xml\",\"warc_filename\":\"/cc_download/warc_2020/CC-MAIN-2020-29/CC-MAIN-2020-29_segments_1593657176116.96_warc_CC-MAIN-20200715230447-20200716020447-00282.warc.gz\"}"}