client.c: supervisor task should use post_select instead of pre_select.

[paraslash.git] / vss.c

diff --git a/vss.c b/vss.c
index 3c566227f0925006a0501ec0ec2e8e5d48dd21bc..1be4cd15d1db262dd5f79a43b19e7bba09f2087a 100644 (file)
--- a/vss.c
+++ b/vss.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>

  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */


@@ -25,6 +25,7 @@
 #include "net.h"
 #include "server.cmdline.h"
 #include "vss.h"
 #include "net.h"
 #include "server.cmdline.h"
 #include "vss.h"

+#include "list.h"

 #include "send.h"
 #include "ipc.h"
 #include "fd.h"
 #include "send.h"
 #include "ipc.h"
 #include "fd.h"


@@ -84,6 +85,18 @@ unsigned int vss_paused(void)
                && !(mmd->new_vss_status_flags & VSS_PLAYING);
 }
 
                && !(mmd->new_vss_status_flags & VSS_PLAYING);
 }
 

+/**
+ * Check if the vss is currently stopped.
+ *
+ * \return Greater than zero if paused, zero otherwise.
+ *
+ */
+unsigned int vss_stopped(void)
+{
+       return (mmd->new_vss_status_flags & VSS_NEXT)
+               && !(mmd->new_vss_status_flags & VSS_PLAYING);
+}
+

 /**
  * Initialize the virtual streaming system.
  *
 /**
  * Initialize the virtual streaming system.
  *


@@ -130,14 +143,6 @@ static int chk_barrier(const char *bname, const struct timeval *now,
        return -1;
 }
 
        return -1;
 }
 

-static void vss_next_chunk_time(struct timeval *due)
-{
-       struct timeval tmp;
-
-       tv_scale(mmd->chunks_sent, &mmd->afd.afhi.chunk_tv, &tmp);
-       tv_add(&tmp, &mmd->stream_start, due);
-}
-

 /*
  * != NULL: timeout for next chunk
  * NULL: nothing to do
 /*
  * != NULL: timeout for next chunk
  * NULL: nothing to do


@@ -164,7 +169,8 @@ static struct timeval *vss_compute_timeout(void)
                return &the_timeout;
        if (!vss_playing() || !map)
                return NULL;
                return &the_timeout;
        if (!vss_playing() || !map)
                return NULL;

-       vss_next_chunk_time(&next_chunk);
+       compute_chunk_time(mmd->chunks_sent, &mmd->afd.afhi.chunk_tv,
+               &mmd->stream_start, &next_chunk);

        if (chk_barrier("chunk", &now, &next_chunk, &the_timeout, 0) < 0)
                return &the_timeout;
        /* chunk is due or bof */
        if (chk_barrier("chunk", &now, &next_chunk, &the_timeout, 0) < 0)
                return &the_timeout;
        /* chunk is due or bof */


@@ -184,6 +190,8 @@ static void vss_eof(void)
                        senders[i].shutdown_clients();
                return;
        }
                        senders[i].shutdown_clients();
                return;
        }

+       if (mmd->new_vss_status_flags & VSS_NOMORE)
+               mmd->new_vss_status_flags = VSS_NEXT;

        gettimeofday(&now, NULL);
        tv_add(&mmd->afd.afhi.eof_tv, &now, &eof_barrier);
        munmap(map, mmd->size);
        gettimeofday(&now, NULL);
        tv_add(&mmd->afd.afhi.eof_tv, &now, &eof_barrier);
        munmap(map, mmd->size);


@@ -194,9 +202,10 @@ static void vss_eof(void)
        free(mmd->afd.afhi.chunk_table);
        mmd->afd.afhi.chunk_table = NULL;
        tmp  = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_AUDIO_FILE_INFO],
        free(mmd->afd.afhi.chunk_table);
        mmd->afd.afhi.chunk_table = NULL;
        tmp  = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_AUDIO_FILE_INFO],

-               status_item_list[SI_TAG_INFO1], status_item_list[SI_TAG_INFO2]);
+               status_item_list[SI_TAGINFO1], status_item_list[SI_TAGINFO2]);

        strncpy(mmd->afd.afhi.info_string, tmp, sizeof(mmd->afd.afhi.info_string));
        mmd->afd.afhi.info_string[sizeof(mmd->afd.afhi.info_string) - 1] = '\0';
        strncpy(mmd->afd.afhi.info_string, tmp, sizeof(mmd->afd.afhi.info_string));
        mmd->afd.afhi.info_string[sizeof(mmd->afd.afhi.info_string) - 1] = '\0';

+       make_empty_status_items(mmd->afd.verbose_ls_output);

        free(tmp);
        mmd->mtime = 0;
        mmd->size = 0;
        free(tmp);
        mmd->mtime = 0;
        mmd->size = 0;


@@ -206,19 +215,14 @@ static void vss_eof(void)
 /**
  * Get the header of the current audio file.
  *
 /**
  * Get the header of the current audio file.
  *

- * \param header_len The length of the header is stored here.
- *
- * \return A pointer to a buffer containing the header, or NULL, if no audio
- * file is selected or if the current audio format does not need special header
- * treamtment.
+ * \param buf The length of the header is stored here.
+ * \param len Points to a buffer containing the header on return.

  *
  *

+ * \sa afh_get_header.

  */
  */

-char *vss_get_header(size_t *header_len)
+void vss_get_header(char **buf, size_t *len)

 {
 {

-       if (!map || !mmd->afd.afhi.header_len)
-               return NULL;
-       *header_len = mmd->afd.afhi.header_len;
-       return map + mmd->afd.afhi.header_offset;
+       afh_get_header(&mmd->afd.afhi, map, buf, len);

 }
 
 /**
 }
 
 /**


@@ -246,9 +250,13 @@ struct timeval *vss_chunk_time(void)
        return &mmd->afd.afhi.chunk_tv;
 }
 
        return &mmd->afd.afhi.chunk_tv;
 }
 

+/** The possible states of the afs socket. See \ref afs_socket. */

 enum afs_socket_status {
 enum afs_socket_status {

+       /** Socket is inactive. */

        AFS_SOCKET_READY,
        AFS_SOCKET_READY,

+       /** Socket fd was included in the write fd set for select(). */

        AFS_SOCKET_CHECK_FOR_WRITE,
        AFS_SOCKET_CHECK_FOR_WRITE,

+       /** vss wrote a request to the socket and waits for afs to reply. */

        AFS_SOCKET_AFD_PENDING
 };
 
        AFS_SOCKET_AFD_PENDING
 };
 


@@ -300,8 +308,6 @@ struct timeval *vss_preselect(fd_set *rfds, fd_set *wfds, int *max_fileno)
                                tv_add(&mmd->afd.afhi.eof_tv, &now, &eof_barrier);
                        if (vss_repos())
                                tv_add(&now, &announce_tv, &data_send_barrier);
                                tv_add(&mmd->afd.afhi.eof_tv, &now, &eof_barrier);
                        if (vss_repos())
                                tv_add(&now, &announce_tv, &data_send_barrier);

-                       if (mmd->new_vss_status_flags & VSS_NOMORE)
-                               mmd->new_vss_status_flags = VSS_NEXT;

                }
                mmd->chunks_sent = 0;
        }
                }
                mmd->chunks_sent = 0;
        }


@@ -332,6 +338,7 @@ static int recv_afs_msg(int *fd, uint32_t *code, uint32_t *data)
        struct iovec iov;
        int ret = 0;
 
        struct iovec iov;
        int ret = 0;
 

+       *fd = -1;

        iov.iov_base = buf;
        iov.iov_len = sizeof(buf);
        msg.msg_iov = &iov;
        iov.iov_base = buf;
        iov.iov_len = sizeof(buf);
        msg.msg_iov = &iov;


@@ -342,8 +349,9 @@ static int recv_afs_msg(int *fd, uint32_t *code, uint32_t *data)
        ret = recvmsg(afs_socket, &msg, 0);
        if (ret < 0)
                return -ERRNO_TO_PARA_ERROR(errno);
        ret = recvmsg(afs_socket, &msg, 0);
        if (ret < 0)
                return -ERRNO_TO_PARA_ERROR(errno);

+       afsss = AFS_SOCKET_READY;

        if (iov.iov_len != sizeof(buf))
        if (iov.iov_len != sizeof(buf))

-               return -E_SHORT_AFS_READ;
+               return -E_AFS_SHORT_READ;

        *code = *(uint32_t*)buf;
        *data =  *(uint32_t*)(buf + 4);
        for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
        *code = *(uint32_t*)buf;
        *data =  *(uint32_t*)(buf + 4);
        for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {


@@ -359,20 +367,22 @@ static int recv_afs_msg(int *fd, uint32_t *code, uint32_t *data)
 
 static void recv_afs_result(void)
 {
 
 static void recv_afs_result(void)
 {

-       int ret, passed_fd = -1, shmid;
+       int ret, passed_fd, shmid;

        uint32_t afs_code = 0, afs_data = 0;
        struct stat statbuf;
        struct timeval now;
 
        uint32_t afs_code = 0, afs_data = 0;
        struct stat statbuf;
        struct timeval now;
 

+       mmd->afd.afhi.chunk_table = NULL;

        ret = recv_afs_msg(&passed_fd, &afs_code, &afs_data);
        if (ret < 0)
                goto err;
        ret = recv_afs_msg(&passed_fd, &afs_code, &afs_data);
        if (ret < 0)
                goto err;

-       PARA_DEBUG_LOG("got the fd: %d, code: %u, shmid: %u\n",
-               passed_fd, afs_code, afs_data);
-       ret = -E_BAD_AFS_CODE;
+       PARA_DEBUG_LOG("fd: %d, code: %u, shmid: %u\n", passed_fd, afs_code,
+               afs_data);
+       ret = -E_NOFD;

        if (afs_code != NEXT_AUDIO_FILE)
                goto err;
        if (afs_code != NEXT_AUDIO_FILE)
                goto err;

-       afsss = AFS_SOCKET_READY;
+       if (passed_fd < 0)
+               goto err;

        shmid = afs_data;
        ret = load_afd(shmid, &mmd->afd);
        if (ret < 0)
        shmid = afs_data;
        ret = load_afd(shmid, &mmd->afd);
        if (ret < 0)


@@ -399,9 +409,11 @@ static void recv_afs_result(void)
        tv_add(&now, &announce_tv, &data_send_barrier);
        return;
 err:
        tv_add(&now, &announce_tv, &data_send_barrier);
        return;
 err:

+       free(mmd->afd.afhi.chunk_table);

        if (passed_fd >= 0)
                close(passed_fd);
        if (passed_fd >= 0)
                close(passed_fd);

-       PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+       PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+       mmd->new_vss_status_flags = VSS_NEXT;

 }
 
 void vss_post_select(fd_set *rfds, fd_set *wfds)
 }
 
 void vss_post_select(fd_set *rfds, fd_set *wfds)


@@ -416,14 +428,6 @@ void vss_post_select(fd_set *rfds, fd_set *wfds)
        ret = send_buffer(afs_socket, "new");
        afsss = AFS_SOCKET_AFD_PENDING;
 }
        ret = send_buffer(afs_socket, "new");
        afsss = AFS_SOCKET_AFD_PENDING;
 }

-
-static void get_chunk(long unsigned chunk_num, char **buf, size_t *len)
-{
-       size_t pos = mmd->afd.afhi.chunk_table[chunk_num];
-       *buf = map + pos;
-       *len = mmd->afd.afhi.chunk_table[chunk_num + 1] - pos;
-}
-

 /**
  * Get the data of the given chunk.
  *
 /**
  * Get the data of the given chunk.
  *


@@ -439,7 +443,7 @@ int vss_get_chunk(long unsigned chunk_num, char **buf, size_t *len)
                return -E_CHUNK;
        if (chunk_num >= mmd->afd.afhi.chunks_total)
                return -E_CHUNK;
                return -E_CHUNK;
        if (chunk_num >= mmd->afd.afhi.chunks_total)
                return -E_CHUNK;

-       get_chunk(chunk_num, buf, len);
+       afh_get_chunk(chunk_num, &mmd->afd.afhi, map, buf, len);

        return 1;
 }
 
        return 1;
 }
 


@@ -462,7 +466,8 @@ void vss_send_chunk(void)
        if (!map || !vss_playing())
                return;
        gettimeofday(&now, NULL);
        if (!map || !vss_playing())
                return;
        gettimeofday(&now, NULL);

-       vss_next_chunk_time(&due);
+       compute_chunk_time(mmd->chunks_sent, &mmd->afd.afhi.chunk_tv,
+               &mmd->stream_start, &due);

        if (tv_diff(&due, &now, NULL) > 0)
                return;
        if (chk_barrier("eof", &now, &eof_barrier, &due, 1) < 0)
        if (tv_diff(&due, &now, NULL) > 0)
                return;
        if (chk_barrier("eof", &now, &eof_barrier, &due, 1) < 0)


@@ -477,8 +482,8 @@ void vss_send_chunk(void)
        }
        /*
         * We call the send function also in case of empty chunks as they
        }
        /*
         * We call the send function also in case of empty chunks as they

-        * might have still some data queued which can be sent in this case.
-        */
+        * might have still some data queued which can be sent in this case.
+        */

        if (!mmd->chunks_sent) {
                struct timeval tmp;
                gettimeofday(&mmd->stream_start, NULL);
        if (!mmd->chunks_sent) {
                struct timeval tmp;
                gettimeofday(&mmd->stream_start, NULL);


@@ -486,7 +491,7 @@ void vss_send_chunk(void)
                mmd->offset = tv2ms(&tmp);
                mmd->events++;
        }
                mmd->offset = tv2ms(&tmp);
                mmd->events++;
        }

-       get_chunk(mmd->current_chunk, &buf, &len);
+       afh_get_chunk(mmd->current_chunk, &mmd->afd.afhi, map, &buf, &len);

        for (i = 0; senders[i].name; i++)
                senders[i].send(mmd->current_chunk, mmd->chunks_sent, buf, len);
        mmd->new_vss_status_flags |= VSS_PLAYING;
        for (i = 0; senders[i].name; i++)
                senders[i].send(mmd->current_chunk, mmd->chunks_sent, buf, len);
        mmd->new_vss_status_flags |= VSS_PLAYING;