Make para_recv use the new scheduler.
[paraslash.git] / ortp_recv.c
index 1e44042..99b53ad 100644 (file)
@@ -21,6 +21,8 @@
 #include "para.h"
 
 #include "ortp.h"
+#include "list.h"
+#include "sched.h"
 #include "recv.h"
 #include "ortp_recv.cmdline.h"
 
@@ -66,24 +68,22 @@ uint32_t timestamp;
 uint32_t chunk_ts;
 };
 
-static int ortp_recv_pre_select(struct receiver_node *rn,
-               __unused fd_set *rfds, __unused fd_set *wfds,
-               struct timeval *timeout)
+static void ortp_recv_pre_select(struct sched *s, struct task *t)
 {
+       struct receiver_node *rn = t->private_data;
        struct private_ortp_recv_data *pord = rn->private_data;
-       struct timeval now, tmp;
+       struct timeval tmp;
 
-       gettimeofday(&now, NULL);
-       if (tv_diff(&now, &pord->next_chunk, &tmp) >= 0) {
+       if (tv_diff(&s->now, &pord->next_chunk, &tmp) >= 0) {
                tmp.tv_sec = 0;
                tmp.tv_usec = 1000;
        }
-       if (tv_diff(timeout, &tmp, NULL) > 0)
-               *timeout = tmp;
-       return -1; /* we did not modify the fd sets */
+       if (tv_diff(&s->timeout, &tmp, NULL) > 0)
+               s->timeout = tmp;
+       t->ret = 1;
 }
 
-static void compute_next_chunk(struct timeval *now, unsigned chunk_time,
+static void compute_next_chunk(unsigned chunk_time,
                struct private_ortp_recv_data *pord)
 {
        struct timeval chunk_tv = {0, chunk_time};
@@ -96,52 +96,44 @@ static void compute_next_chunk(struct timeval *now, unsigned chunk_time,
                pord->timestamp, pord->next_chunk.tv_sec,
                pord->next_chunk.tv_usec);
 }
-/** \cond */
-#define BUF_TO_VAL(buf) (((unsigned)(buf)[1] & 0xff) +  256 \
-       * ((unsigned)(buf)[0] & 0xff))
-/** \endcond */
-
 
-static int ortp_recv_post_select(struct receiver_node *rn, int select_ret,
-       __unused fd_set *rfds, __unused fd_set *wfds)
+static void ortp_recv_post_select(struct sched *s, struct task *t)
 {
+       struct receiver_node *rn = t->private_data;
        struct private_ortp_recv_data *pord = rn->private_data;
        mblk_t *mp;
-       int ret, packet_type, stream_type;
+       int packet_type, stream_type;
        char tmpbuf[CHUNK_SIZE + 3];
-       struct timeval now;
        unsigned chunk_time;
 
-       gettimeofday(&now, NULL);
 //     PARA_DEBUG_LOG("rn: %p, pord: %p, session: %p\n", rn, pord, pord->session);
-       if (pord->start.tv_sec) {
-               struct timeval diff;
-               if (tv_diff(&now, &pord->next_chunk, &diff) < 0)
-                               return 1;
-       }
+       t->ret = 1;
+       if (pord->start.tv_sec)
+               if (tv_diff(&s->now, &pord->next_chunk, NULL) < 0)
+                       return;
        mp = rtp_session_recvm_with_ts(pord->session, pord->timestamp);
        if (!mp) {
                struct timeval min_delay = {0, 100};
 //             PARA_INFO_LOG("nope, chunk_ts = %d, loaded: %d, bad: %d\n",
 //                     pord->timestamp, rn->loaded, pord->c_bad);
                pord->c_bad++;
+               t->ret = -E_TOO_MANY_BAD_CHUNKS;
                if ((pord->c_bad > 5000 && pord->start.tv_sec) || pord->c_bad > 10000)
-                       return -E_TOO_MANY_BAD_CHUNKS;
-               tv_add(&now, &min_delay, &pord->next_chunk);
-               return 1;
+                       return;
+               t->ret = 1;
+               tv_add(&s->now, &min_delay, &pord->next_chunk);
+               return;
        }
        /* okay, we have a chunk of data */
        if (!pord->start.tv_sec)
-               pord->start = now;
-       ret = msg_to_buf(mp, tmpbuf, CHUNK_SIZE);
-//     PARA_DEBUG_LOG("have it ts = %d, chunk_ts = %d, loaded: %d, "
-//             "bad: %d, len: %d\n", pord->timestamp, pord->chunk_ts,
-//             rn->loaded, pord->c_bad, ret);
-       if (ret < ORTP_AUDIO_HEADER_LEN) {
-               if (ret < 0)
-                       ret = -E_MSG_TO_BUF;
+               pord->start = s->now;
+       t->ret = msg_to_buf(mp, tmpbuf, CHUNK_SIZE);
+       if (t->ret < ORTP_AUDIO_HEADER_LEN) {
+               rn->eof = 1;
+               if (t->ret < 0)
+                       t->ret = -E_MSG_TO_BUF;
                else
-                       ret = 0;
+                       t->ret = -E_ORTP_RECV_EOF;
                goto err_out;
        }
        packet_type = READ_PACKET_TYPE(tmpbuf);
@@ -154,65 +146,67 @@ static int ortp_recv_post_select(struct receiver_node *rn, int select_ret,
        switch (packet_type) {
        unsigned header_len, payload_len;
        case ORTP_EOF:
-               ret = 0;
+               rn->eof = 1;
+               t->ret = -E_ORTP_RECV_EOF;
                goto err_out;
        case ORTP_BOF:
-               PARA_INFO_LOG("bof (%d)\n", ret);
+               PARA_INFO_LOG("bof (%d)\n", t->ret);
                pord->have_header = 1;
                /* fall through */
        case ORTP_DATA:
                if (!pord->have_header && stream_type)
                /* can't use the data, wait for header */
                        goto success;
-               if (ret + rn->loaded >= CHUNK_SIZE + ORTP_AUDIO_HEADER_LEN) {
-                       ret = -E_OVERRUN;
+               if (t->ret + rn->loaded >= CHUNK_SIZE + ORTP_AUDIO_HEADER_LEN) {
+                       t->ret = -E_OVERRUN;
                        goto err_out;
                }
-               if (ret > ORTP_AUDIO_HEADER_LEN) {
+               if (t->ret > ORTP_AUDIO_HEADER_LEN) {
                        memcpy(rn->buf + rn->loaded, tmpbuf + ORTP_AUDIO_HEADER_LEN,
-                               ret - ORTP_AUDIO_HEADER_LEN);
-                       rn->loaded += ret - ORTP_AUDIO_HEADER_LEN;
+                               t->ret - ORTP_AUDIO_HEADER_LEN);
+                       rn->loaded += t->ret - ORTP_AUDIO_HEADER_LEN;
                }
                goto success;
        case ORTP_HEADER:
                header_len = READ_HEADER_LEN(tmpbuf);
                PARA_DEBUG_LOG("header packet (%d bytes), header len: %d\n",
-                       ret, header_len);
+                       t->ret, header_len);
                if (!pord->have_header) {
                        pord->have_header = 1;
                        memcpy(rn->buf, tmpbuf + ORTP_AUDIO_HEADER_LEN,
-                               ret - ORTP_AUDIO_HEADER_LEN);
-                       rn->loaded = ret - ORTP_AUDIO_HEADER_LEN;
+                               t->ret - ORTP_AUDIO_HEADER_LEN);
+                       rn->loaded = t->ret - ORTP_AUDIO_HEADER_LEN;
                        goto success;
                }
-               if (header_len + ORTP_AUDIO_HEADER_LEN > ret) {
-                       ret = -E_INVALID_HEADER;
+               if (header_len + ORTP_AUDIO_HEADER_LEN > t->ret) {
+                       t->ret = -E_INVALID_HEADER;
                        goto err_out;
                }
-               payload_len = ret - ORTP_AUDIO_HEADER_LEN - header_len;
+               payload_len = t->ret - ORTP_AUDIO_HEADER_LEN - header_len;
 //             PARA_INFO_LOG("len: %d header_len: %d, payload_len: %d, loaded: %d\n", ret,
 //                     header_len, payload_len, rn->loaded);
                if (rn->loaded + payload_len > CHUNK_SIZE) {
-                       ret = -E_OVERRUN;
+                       t->ret = -E_OVERRUN;
                        goto err_out;
                }
                if (payload_len)
                        memcpy(rn->buf + rn->loaded, tmpbuf
-                               + (ret - payload_len), payload_len);
+                               + (t->ret - payload_len), payload_len);
                rn->loaded += payload_len;
                goto success;
        }
 success:
+       t->ret = 1;
        freemsg(mp);
        if (pord->c_bad) {
                pord->c_bad = 0;
-               pord->next_chunk = now;
+               pord->next_chunk = s->now;
        }
-       compute_next_chunk(&now, chunk_time, pord);
-       return 1;
+       compute_next_chunk(chunk_time, pord);
+       return;
 err_out:
        freemsg(mp);
-       return ret;
+       return;
 }
 
 static void ortp_shutdown(void)