* senders.
*/
+#include <regex.h>
#include <dirent.h>
+#include <osl.h>
#include "para.h"
#include "error.h"
/** 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;
}
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();
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
}
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);
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 = mmd->afd.afhi.eof_tv,
- *chunk_tv = vss_chunk_time();
+ 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;
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;
}
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;
&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)
} 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;
projects / paraslash.git / blobdiff