Major audio format handler cleanups.
[paraslash.git] / vss.c
diff --git a/vss.c b/vss.c
index 1dd2466..458394b 100644 (file)
--- a/vss.c
+++ b/vss.c
@@ -12,6 +12,7 @@
  */
 
 #include <dirent.h>
+#include <osl.h>
 
 #include "para.h"
 #include "error.h"
@@ -124,13 +125,15 @@ struct fec_group {
        /** The group duration divided by the number of slices. */
        struct timeval slice_duration;
        /** Group contains the audio file header that occupies that many slices. */
-       unsigned num_header_slices;
+       uint8_t num_header_slices;
 };
 
 /**
  * Describes one connected FEC client.
  */
 struct fec_client {
+       /** If negative, this client is temporarily disabled. */
+       int error;
        /** Parameters requested by the client. */
        struct fec_client_parms *fcp;
        /** Used by the core FEC code. */
@@ -209,21 +212,30 @@ static int need_audio_header(struct fec_client *fc, struct vss_task *vsst)
                return 0;
        if (!vsst->header_len)
                return 0;
-       if (fc->group.num && tv_diff(&fc->next_header_time, now, NULL) < 0)
+       if (fc->group.num && tv_diff(&fc->next_header_time, now, NULL) > 0)
                return 0;
        tv_add(now, &vsst->header_interval, &fc->next_header_time);
        return 1;
 }
 
-static uint8_t num_slices(long unsigned bytes, struct fec_client *fc)
+static int num_slices(long unsigned bytes, struct fec_client *fc, uint8_t *result)
 {
-       uint16_t m = fc->fcp->max_slice_bytes - FEC_HEADER_SIZE;
-       return (bytes + m - 1) / m;
+       unsigned long m = fc->fcp->max_slice_bytes - FEC_HEADER_SIZE;
+       unsigned rv, redundant_slices = fc->fcp->slices_per_group
+               - fc->fcp->data_slices_per_group;
+
+       if (!m)
+               return -E_BAD_CT;
+       rv = (bytes + m - 1) / m;
+       if (rv + redundant_slices > 255)
+               return -E_BAD_CT;
+       *result = rv;
+       return 1;
 }
 
 static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst)
 {
-       int i, k, data_slices;
+       int ret, i, k, data_slices;
        size_t len;
        const char *buf, *start_buf;
        struct timeval tmp, *chunk_tv = vss_chunk_time();
@@ -236,12 +248,15 @@ static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst)
        if (fc->first_stream_chunk < 0) {
                uint32_t largest = afh_get_largest_chunk_size(&mmd->afd.afhi)
                        + vsst->header_len;
-               uint8_t needed = num_slices(largest, fc), want;
+               uint8_t needed, want;
+
+               ret = num_slices(largest, fc, &needed);
+               if (ret < 0)
+                       return ret;
                if (needed > fc->fcp->data_slices_per_group)
                        PARA_WARNING_LOG("fec parms insufficient for this audio file\n");
                want = PARA_MAX(needed, fc->fcp->data_slices_per_group);
                if (want != k) {
-                       int ret;
                        fec_free(fc->parms);
                        fc->src_data = para_realloc(fc->src_data, want * sizeof(char *));
                        ret = fec_new(want, want + fc->fcp->slices_per_group
@@ -266,9 +281,11 @@ static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst)
        }
        if (g->first_chunk >= mmd->afd.afhi.chunks_total)
                return 0;
-       if (need_audio_header(fc, vsst))
-               g->num_header_slices = num_slices(vsst->header_len, fc);
-       else
+       if (need_audio_header(fc, vsst)) {
+               ret = num_slices(vsst->header_len, fc, &g->num_header_slices);
+               if (ret < 0)
+                       return ret;
+       } else
                g->num_header_slices = 0;
        afh_get_chunk(g->first_chunk, &mmd->afd.afhi, vsst->map, &start_buf,
                &len);
@@ -338,10 +355,18 @@ static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst)
 
 static int compute_next_fec_slice(struct fec_client *fc, struct vss_task *vsst)
 {
+       assert(fc->error >= 0);
        if (fc->first_stream_chunk < 0 || fc->current_slice_num
                        == fc->fcp->slices_per_group + fc->num_extra_slices) {
-               if (!setup_next_fec_group(fc, vsst))
+               int ret = setup_next_fec_group(fc, vsst);
+               if (ret == 0)
                        return 0;
+               if (ret < 0) {
+                       PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+                       PARA_ERROR_LOG("FEC client temporarily disabled\n");
+                       fc->error = ret;
+                       return fc->error;
+               }
        }
        write_fec_header(fc, vsst);
        fec_encode(fc->parms, fc->src_data, fc->enc_buf + FEC_HEADER_SIZE,
@@ -446,6 +471,8 @@ static void compute_slice_timeout(struct timeval *timeout)
        list_for_each_entry(fc, &fec_client_list, node) {
                struct timeval diff;
 
+               if (fc->error < 0)
+                       continue;
                if (next_slice_is_due(fc, &diff)) {
                        timeout->tv_sec = 0;
                        timeout->tv_usec = 0;
@@ -457,6 +484,26 @@ static void compute_slice_timeout(struct timeval *timeout)
        }
 }
 
+static void set_eof_barrier(struct vss_task *vsst)
+{
+       struct fec_client *fc;
+       struct timeval timeout = {1, 0}, *chunk_tv = vss_chunk_time();
+
+       if (!chunk_tv)
+               goto out;
+       list_for_each_entry(fc, &fec_client_list, node) {
+               struct timeval group_duration;
+
+               if (fc->error < 0)
+                       continue;
+               tv_scale(fc->group.num_chunks, chunk_tv, &group_duration);
+               if (tv_diff(&timeout, &group_duration, NULL) < 0)
+                       timeout = group_duration;
+       }
+out:
+       tv_add(now, &timeout, &vsst->eof_barrier);
+}
+
 /**
  * Check if vss status flag \a P (playing) is set.
  *
@@ -568,12 +615,11 @@ static struct timeval *vss_compute_timeout(struct vss_task *vsst)
 static void vss_eof(struct vss_task *vsst)
 {
 
-       mmd->stream_start = *now;
        if (!vsst->map)
                return;
        if (mmd->new_vss_status_flags & VSS_NOMORE)
                mmd->new_vss_status_flags = VSS_NEXT;
-       tv_add(&mmd->afd.afhi.eof_tv, now, &vsst->eof_barrier);
+       set_eof_barrier(vsst);
        para_munmap(vsst->map, mmd->size);
        vsst->map = NULL;
        mmd->chunks_sent = 0;
@@ -583,9 +629,6 @@ static void vss_eof(struct vss_task *vsst)
        mmd->afd.afhi.chunk_tv.tv_usec = 0;
        free(mmd->afd.afhi.chunk_table);
        mmd->afd.afhi.chunk_table = NULL;
-       free(mmd->afd.afhi.info_string);
-       mmd->afd.afhi.info_string = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_AUDIO_FILE_INFO],
-               status_item_list[SI_TAGINFO1], status_item_list[SI_TAGINFO2]);
        make_empty_status_items(mmd->afd.verbose_ls_output);
        mmd->mtime = 0;
        mmd->size = 0;
@@ -623,10 +666,7 @@ static int need_to_request_new_audio_file(struct vss_task *vsst)
 }
 
 /**
- * Compute the timeout for para_server's main select-loop.
- *
- * This function gets called from para_server to determine the timeout value
- * for its main select loop.
+ * Compute the timeout for the main select-loop of the scheduler.
  *
  * \param s Pointer to the server scheduler.
  * \param t Pointer to the vss task structure.
@@ -650,18 +690,22 @@ static void vss_pre_select(struct sched *s, struct task *t)
                for (i = 0; senders[i].name; i++)
                        if (senders[i].shutdown_clients)
                                senders[i].shutdown_clients();
-               list_for_each_entry_safe(fc, tmp, &fec_client_list, node)
+               list_for_each_entry_safe(fc, tmp, &fec_client_list, node) {
                        fc->first_stream_chunk = -1;
+                       fc->error = 0;
+               }
+               mmd->stream_start.tv_sec = 0;
+               mmd->stream_start.tv_usec = 0;
        }
        if (vss_next())
                vss_eof(vsst);
        else if (vss_paused()) {
                if (mmd->chunks_sent)
-                       tv_add(&mmd->afd.afhi.eof_tv, now, &vsst->eof_barrier);
+                       set_eof_barrier(vsst);
                mmd->chunks_sent = 0;
        } else if (vss_repos()) {
                tv_add(now, &vsst->announce_tv, &vsst->data_send_barrier);
-               tv_add(&mmd->afd.afhi.eof_tv, now, &vsst->eof_barrier);
+               set_eof_barrier(vsst);
                mmd->chunks_sent = 0;
                mmd->current_chunk = mmd->repos_request;
                mmd->new_vss_status_flags &= ~VSS_REPOS;
@@ -708,9 +752,9 @@ static int recv_afs_msg(int afs_socket, int *fd, uint32_t *code, uint32_t *data)
        for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
                if (cmsg->cmsg_level != SOL_SOCKET
                        || cmsg->cmsg_type != SCM_RIGHTS)
-               continue;
+                       continue;
                if ((cmsg->cmsg_len - CMSG_LEN(0)) / sizeof(int) != 1)
-               continue;
+                       continue;
                *fd = *(int *)CMSG_DATA(cmsg);
        }
        return 1;
@@ -723,7 +767,6 @@ static void recv_afs_result(struct vss_task *vsst)
        struct stat statbuf;
 
        vsst->afsss = AFS_SOCKET_READY;
-       mmd->afd.afhi.chunk_table = NULL;
        ret = recv_afs_msg(vsst->afs_socket, &passed_fd, &afs_code, &afs_data);
        if (ret < 0)
                goto err;
@@ -780,7 +823,7 @@ err:
  */
 static void vss_send(struct vss_task *vsst)
 {
-       int i;
+       int i, sent_something = 0;
        struct timeval due;
        struct fec_client *fc, *tmp_fc;
 
@@ -791,8 +834,24 @@ static void vss_send(struct vss_task *vsst)
        if (chk_barrier("data send", &vsst->data_send_barrier,
                        &due, 1) < 0)
                return;
+       list_for_each_entry_safe(fc, tmp_fc, &fec_client_list, node) {
+               if (fc->error < 0)
+                       continue;
+               if (!next_slice_is_due(fc, NULL))
+                       continue;
+               if (compute_next_fec_slice(fc, vsst) <= 0)
+                       continue;
+               PARA_DEBUG_LOG("sending %d:%d (%u bytes)\n", fc->group.num,
+                       fc->current_slice_num, fc->fcp->max_slice_bytes);
+               fc->fcp->send((char *)fc->enc_buf,
+                       fc->fcp->max_slice_bytes,
+                       fc->fcp->private_data);
+               fc->current_slice_num++;
+               sent_something = 1;
+       }
        if (mmd->current_chunk >= mmd->afd.afhi.chunks_total) { /* eof */
-               mmd->new_vss_status_flags |= VSS_NEXT;
+               if (!sent_something)
+                       mmd->new_vss_status_flags |= VSS_NEXT;
                return;
        }
        compute_chunk_time(mmd->chunks_sent, &mmd->afd.afhi.chunk_tv,
@@ -824,18 +883,6 @@ static void vss_send(struct vss_task *vsst)
                mmd->chunks_sent++;
                mmd->current_chunk++;
        }
-       list_for_each_entry_safe(fc, tmp_fc, &fec_client_list, node) {
-               if (!next_slice_is_due(fc, NULL))
-                       continue;
-               if (!compute_next_fec_slice(fc, vsst))
-                       continue;
-               PARA_DEBUG_LOG("sending %d:%d (%u bytes)\n", fc->group.num,
-                       fc->current_slice_num, fc->fcp->max_slice_bytes);
-               fc->fcp->send((char *)fc->enc_buf,
-                       fc->fcp->max_slice_bytes,
-                       fc->fcp->private_data);
-               fc->current_slice_num++;
-       }
 }
 
 static void vss_post_select(struct sched *s, struct task *t)
@@ -858,7 +905,10 @@ static void vss_post_select(struct sched *s, struct task *t)
        } else if (FD_ISSET(vsst->afs_socket, &s->wfds)) {
                PARA_NOTICE_LOG("requesting new fd from afs\n");
                ret = send_buffer(vsst->afs_socket, "new");
-               vsst->afsss = AFS_SOCKET_AFD_PENDING;
+               if (ret < 0)
+                       PARA_CRIT_LOG("%s\n", para_strerror(-ret));
+               else
+                       vsst->afsss = AFS_SOCKET_AFD_PENDING;
        }
        for (i = 0; senders[i].name; i++) {
                if (!senders[i].post_select)