Fix various dead stores found by the clang static analyzer.

[paraslash.git] / vss.c

diff --git a/vss.c b/vss.c
index 37a80759e17a09bb2bd21ab8c6678985e5e0da25..066a8851bca7633f04dfb139d4c15ec19f5cdfa1 100644 (file)
--- a/vss.c
+++ b/vss.c
@@ -458,6 +458,24 @@ static void compute_slice_timeout(struct timeval *timeout)
        }
 }
 
+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();
+
+       if (!chunk_tv)
+               goto out;
+       list_for_each_entry(fc, &fec_client_list, node) {
+               struct timeval group_duration;
+               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.
  *
@@ -569,12 +587,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;
@@ -624,10 +641,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.
@@ -653,16 +667,18 @@ static void vss_pre_select(struct sched *s, struct task *t)
                                senders[i].shutdown_clients();
                list_for_each_entry_safe(fc, tmp, &fec_client_list, node)
                        fc->first_stream_chunk = -1;
+               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;
@@ -861,7 +877,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)