vss: Switch to the alternative post select method.

diff --git a/vss.c b/vss.c
index cfa64a143cb1f5d665990dc6aeb23ef94d064d4c..5b8c687d7651dbf92ba3631d7b9aea3005ed3608 100644 (file)
--- a/vss.c
+++ b/vss.c
@@ -1114,12 +1114,11 @@ static void vss_send(struct vss_task *vsst)
        }
 }
 
        }
 }
 

-static void vss_post_select(struct sched *s, struct task *t)
+static int vss_post_select(struct sched *s, struct task *t)

 {
        int ret, i;
        struct vss_task *vsst = container_of(t, struct vss_task, task);
 
 {
        int ret, i;
        struct vss_task *vsst = container_of(t, struct vss_task, task);
 

-

        if (mmd->sender_cmd_data.cmd_num >= 0) {
                int num = mmd->sender_cmd_data.cmd_num,
                        sender_num = mmd->sender_cmd_data.sender_num;
        if (mmd->sender_cmd_data.cmd_num >= 0) {
                int num = mmd->sender_cmd_data.cmd_num,
                        sender_num = mmd->sender_cmd_data.sender_num;


@@ -1151,6 +1150,7 @@ static void vss_post_select(struct sched *s, struct task *t)
                        (vss_next() && vss_playing()))
                tv_add(now, &vsst->announce_tv, &vsst->data_send_barrier);
        vss_send(vsst);
                        (vss_next() && vss_playing()))
                tv_add(now, &vsst->announce_tv, &vsst->data_send_barrier);
        vss_send(vsst);

+       return 0;

 }
 
 /**
 }
 
 /**


@@ -1174,7 +1174,8 @@ void init_vss_task(int afs_socket, struct sched *s)
        vsst->header_interval.tv_sec = 5; /* should this be configurable? */
        vsst->afs_socket = afs_socket;
        vsst->task.pre_select = vss_pre_select;
        vsst->header_interval.tv_sec = 5; /* should this be configurable? */
        vsst->afs_socket = afs_socket;
        vsst->task.pre_select = vss_pre_select;

-       vsst->task.post_select = vss_post_select;
+       vsst->task.new_post_select = vss_post_select;
+       vsst->task.post_select = NULL;

        ms2tv(announce_time, &vsst->announce_tv);
        PARA_INFO_LOG("announce timeval: %lums\n", tv2ms(&vsst->announce_tv));
        INIT_LIST_HEAD(&fec_client_list);
        ms2tv(announce_time, &vsst->announce_tv);
        PARA_INFO_LOG("announce timeval: %lums\n", tv2ms(&vsst->announce_tv));
        INIT_LIST_HEAD(&fec_client_list);