* senders.
*/
+#include <regex.h>
#include <dirent.h>
+#include <osl.h>
#include "para.h"
#include "error.h"
uint32_t num_chunks;
/** When the first chunk was sent. */
struct timeval start;
+ /** The duration of the full group. */
+ struct timeval duration;
/** 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. */
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;
+}
+
+/* set group start and group duration */
+static void set_group_timing(struct fec_client *fc, struct fec_group *g)
+{
+ struct timeval *chunk_tv = vss_chunk_time();
+
+ tv_scale(g->num_chunks, chunk_tv, &g->duration);
+ tv_divide(fc->fcp->slices_per_group + fc->num_extra_slices,
+ &g->duration, &g->slice_duration);
+ PARA_DEBUG_LOG("durations (group/chunk/slice): %lu/%lu/%lu\n",
+ tv2ms(&g->duration), tv2ms(chunk_tv), tv2ms(&g->slice_duration));
}
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();
struct fec_group *g = &fc->group;
unsigned slice_bytes = fc->fcp->max_slice_bytes - FEC_HEADER_SIZE;
uint32_t max_data_size;
- assert(chunk_tv);
- k = fc->fcp->data_slices_per_group + fc->num_extra_slices;
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;
- 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
- - fc->fcp->data_slices_per_group, &fc->parms);
- if (ret < 0)
- return ret;
- k = want;
- fc->num_extra_slices = 0;
- if (k > fc->fcp->data_slices_per_group) {
- fc->num_extra_slices = k - fc->fcp->data_slices_per_group;
- PARA_NOTICE_LOG("using %d extra slices\n",
- fc->num_extra_slices);
- }
- }
+ uint8_t hs, ds; /* needed header/data slices */
+ uint8_t rs = fc->fcp->slices_per_group
+ - fc->fcp->data_slices_per_group; /* redundant slices */
+ int n;
+
+ ret = num_slices(vsst->header_len, fc, &hs);
+ if (ret < 0)
+ return ret;
+ ret = num_slices(afh_get_largest_chunk_size(&mmd->afd.afhi),
+ fc, &ds);
+ if (ret < 0)
+ return ret;
+ k = (int)hs + ds;
+ if (k > 255)
+ return -E_BAD_CT;
+ if (k < fc->fcp->data_slices_per_group)
+ k = fc->fcp->data_slices_per_group;
+ n = k + rs;
+ fc->num_extra_slices = k - fc->fcp->data_slices_per_group;
+ PARA_NOTICE_LOG("fec parms %d:%d:%d (%d extra slices)\n",
+ slice_bytes, k, n, fc->num_extra_slices);
+ fec_free(fc->parms);
+ fc->src_data = para_realloc(fc->src_data, k * sizeof(char *));
+ ret = fec_new(k, n, &fc->parms);
+ if (ret < 0)
+ return ret;
fc->stream_start = *now;
fc->first_stream_chunk = mmd->current_chunk;
g->first_chunk = mmd->current_chunk;
g->num = 0;
+ g->start = *now;
} else {
+ /*
+ * Start and duration of this group depend only on the previous
+ * group. Compute the new group start as g->start += g->duration.
+ */
+ struct timeval tmp = g->start;
+ tv_add(&tmp, &g->duration, &g->start);
+ k = fc->fcp->data_slices_per_group + fc->num_extra_slices;
+ set_group_timing(fc, g);
g->first_chunk += g->num_chunks;
g->num++;
}
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);
g->num_chunks = i - g->first_chunk;
assert(g->num_chunks);
fc->current_slice_num = 0;
+ if (g->num == 0)
+ set_group_timing(fc, g);
/* setup header slices */
buf = vsst->header_buf;
for (; i < k; i++)
fc->src_data[i] = (const unsigned char *)buf;
}
-
- /* setup group timing */
- tv_scale(g->first_chunk - fc->first_stream_chunk, chunk_tv, &tmp);
- tv_add(&fc->stream_start, &tmp, &g->start);
- if (g->num) /* quick hack to avoid buffer underruns */
- g->start.tv_sec--;
- tv_scale(g->num_chunks, chunk_tv, &tmp); /* group duration */
- tv_divide(fc->fcp->slices_per_group + fc->num_extra_slices,
- &tmp, &g->slice_duration);
-
- PARA_DEBUG_LOG("FEC group %d: %d chunks (%d - %d), %d header slices, %d data slices\n",
+ PARA_DEBUG_LOG("FEC group %d: %d chunks (%d - %d), "
+ "%d header slices, %d data slices\n",
g->num, g->num_chunks, g->first_chunk,
g->first_chunk + g->num_chunks - 1,
g->num_header_slices, data_slices
);
- PARA_DEBUG_LOG("durations (group/chunk/slice): %lu/%lu/%lu\n",
- tv2ms(&tmp), tv2ms(chunk_tv), tv2ms(&g->slice_duration));
return 1;
}
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) {
int ret = setup_next_fec_group(fc, vsst);
- if (ret <= 0)
- return ret;
+ 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,
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;
}
}
+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.
*
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;
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;
mmd->events++;
}
/**
- * 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.
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;
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;
*/
static void vss_send(struct vss_task *vsst)
{
- int i, sent_something = 0;
+ int i, fec_active = 0;
struct timeval due;
struct fec_client *fc, *tmp_fc;
&due, 1) < 0)
return;
list_for_each_entry_safe(fc, tmp_fc, &fec_client_list, node) {
- if (!next_slice_is_due(fc, NULL))
+ if (fc->error < 0)
continue;
+ if (!next_slice_is_due(fc, NULL)) {
+ fec_active = 1;
+ continue;
+ }
if (compute_next_fec_slice(fc, vsst) <= 0)
continue;
PARA_DEBUG_LOG("sending %d:%d (%u bytes)\n", fc->group.num,
fc->fcp->max_slice_bytes,
fc->fcp->private_data);
fc->current_slice_num++;
- sent_something = 1;
+ fec_active = 1;
}
if (mmd->current_chunk >= mmd->afd.afhi.chunks_total) { /* eof */
- if (!sent_something)
+ if (!fec_active)
mmd->new_vss_status_flags |= VSS_NEXT;
return;
}
} 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)
free(hn);
free(home);
mmd->sender_cmd_data.cmd_num = -1;
- make_empty_status_items(mmd->afd.verbose_ls_output);
if (conf.autoplay_given) {
struct timeval tmp;
mmd->vss_status_flags |= VSS_PLAYING;