vss.c: Kill an unused variable.
[paraslash.git] / vss.c
diff --git a/vss.c b/vss.c
index e6cf596..5415929 100644 (file)
--- a/vss.c
+++ b/vss.c
 #include <dirent.h>
 
 #include "para.h"
+#include "error.h"
+#include "string.h"
 #include "afh.h"
+#include "afs.h"
 #include "server.h"
+#include "net.h"
 #include "server.cmdline.h"
 #include "afs_common.h"
 #include "vss.h"
 #include "send.h"
-#include "error.h"
-#include "string.h"
+#include "ipc.h"
 #include "fd.h"
 
 extern const char *status_item_list[];
@@ -201,11 +204,6 @@ void vss_init(void)
        }
 }
 
-static int get_file_info(int i)
-{
-       return  afl[i].get_file_info(map, mmd->size, &mmd->afi);
-}
-
 /**
  * guess the audio format judging from filename
  *
@@ -233,20 +231,7 @@ int guess_audio_format(const char *name)
                        return i;
                }
        }
-       return -1;
-}
-
-static int get_audio_format(int omit)
-{
-       int i;
-
-       FOR_EACH_AUDIO_FORMAT(i) {
-               if (i == omit)
-                       continue;
-               if (get_file_info(i) > 0)
-                       return i;
-       }
-       return -E_AUDIO_FORMAT;
+       return -E_BAD_AUDIO_FILE_SUFFIX;
 }
 
 /**
@@ -288,79 +273,6 @@ int compute_afhi(const char *path, char *data, size_t size,
        return -E_AUDIO_FORMAT;
 }
 
-/*
- * upddate shared mem
- */
-static int update_mmd(void)
-{
-       int i;
-
-       i = guess_audio_format(mmd->filename);
-       if (i < 0 || get_file_info(i) < 0)
-               i = get_audio_format(i);
-       if (i < 0)
-               return i;
-       mmd->audio_format = i;
-       mmd->chunks_sent = 0;
-       mmd->current_chunk = 0;
-       mmd->offset = 0;
-       mmd->events++;
-       return 1;
-}
-
-static void vss_get_audio_file(void)
-{
-       char **sl = selectors[mmd->selector_num].get_audio_file_list(10);
-       int i;
-       struct stat file_status;
-
-       if (!sl)
-               goto err_out;
-       for (i = 0; sl[i]; i++) {
-               struct timeval now;
-               PARA_INFO_LOG("trying %s\n", sl[i]);
-               if (strlen(sl[i]) >= _POSIX_PATH_MAX)
-                       continue;
-               audio_file = open(sl[i], O_RDONLY);
-               if (audio_file < 0)
-                       continue;
-               if (fstat(audio_file, &file_status) == -1 ||
-                               !file_status.st_size) {
-                       close(audio_file);
-                       continue;
-               }
-               mmd->size = file_status.st_size;
-               mmd->mtime = file_status.st_mtime;
-               map = para_mmap(mmd->size, PROT_READ, MAP_PRIVATE,
-                       audio_file, 0);
-               strcpy(mmd->filename, sl[i]);
-               mmd->afi.header_len = 0; /* default: no header */
-               if (update_mmd() < 0) { /* invalid file */
-                       close(audio_file);
-                       munmap(map, mmd->size);
-                       map = NULL;
-                       continue;
-               }
-               mmd->num_played++;
-               if (selectors[mmd->selector_num].update_audio_file)
-                       selectors[mmd->selector_num].update_audio_file(sl[i]);
-               PARA_NOTICE_LOG("next audio file: %s\n", mmd->filename);
-               mmd->new_vss_status_flags &= (~VSS_NEXT);
-               gettimeofday(&now, NULL);
-               tv_add(&now, &announce_tv, &data_send_barrier);
-               goto free;
-       }
-err_out:
-       PARA_ERROR_LOG("%s", "no valid files found\n");
-       mmd->new_vss_status_flags = VSS_NEXT;
-free:
-       if (sl) {
-               for (i = 0; sl[i]; i++)
-                       free(sl[i]);
-               free(sl);
-       }
-}
-
 static int chk_barrier(const char *bname, const struct timeval *now,
                const struct timeval *barrier, struct timeval *diff,
                int print_log)
@@ -425,6 +337,7 @@ static void vss_eof(void)
        int i;
        char *tmp;
 
+       PARA_NOTICE_LOG("EOF\n");
        if (!map) {
                for (i = 0; senders[i].name; i++)
                        senders[i].shutdown_clients();
@@ -497,8 +410,16 @@ struct timeval *vss_chunk_time(void)
        return &mmd->afi.chunk_tv;
 }
 
+enum afs_socket_status {
+       AFS_SOCKET_READY,
+       AFS_SOCKET_CHECK_FOR_WRITE,
+       AFS_SOCKET_AFD_PENDING
+};
+
+static enum afs_socket_status afsss;
+
 /**
- * compute the timeout for para_server's main select-loop
+ * 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.
@@ -507,33 +428,32 @@ struct timeval *vss_chunk_time(void)
  * and acted upon by calling appropriate functions from the lower layers.
  * Possible actions include
  *
- *     - request a new file list from the current audio file selector
- *     - shutdown of all senders (stop/pause command)
- *     - reposition the stream (ff/jmp command)
+ *     - request a new audio file from afs,
+ *     - shutdown of all senders (stop/pause command),
+ *     - reposition the stream (ff/jmp command).
  *
  * \return A pointer to a struct timeval containing the timeout for the next
  * chunk of data to be sent, or NULL if we're not sending right now.
  */
-struct timeval *vss_preselect(void)
+struct timeval *vss_preselect(fd_set *rfds, fd_set *wfds, int *max_fileno)
 {
-       struct audio_format_handler *af = NULL;
-       int i, format;
-       struct timeval *ret;
-again:
-       format = mmd->audio_format;
-       if (format >= 0)
-               af = afl + format;
-       else
+       int i;
+       struct timeval *tv;
+
+       para_fd_set(afs_socket, rfds, max_fileno);
+       if (!map)
                for (i = 0; senders[i].name; i++)
                        senders[i].shutdown_clients();
-       if (vss_next() && af) {
-               vss_eof();
-               return vss_compute_timeout();
+       else {
+               if (vss_next()) {
+                       vss_eof();
+                       return vss_compute_timeout();
+               }
        }
        if (vss_paused() || vss_repos()) {
                for (i = 0; senders[i].name; i++)
                        senders[i].shutdown_clients();
-               if (af) {
+               if (map) {
                        struct timeval now;
                        gettimeofday(&now, NULL);
                        if (!vss_paused() || mmd->chunks_sent)
@@ -549,14 +469,117 @@ again:
                mmd->new_vss_status_flags &= ~(VSS_REPOS);
                mmd->current_chunk = mmd->repos_request;
        }
-       ret = vss_compute_timeout();
-       if (!ret && !map && vss_playing() &&
+       tv = vss_compute_timeout();
+       if (tv)
+               return tv;
+       if (!map && vss_playing() &&
                        !(mmd->new_vss_status_flags & VSS_NOMORE)) {
                PARA_DEBUG_LOG("%s", "ready and playing, but no audio file\n");
-               vss_get_audio_file();
-               goto again;
+               if (afsss == AFS_SOCKET_READY) {
+                       para_fd_set(afs_socket, wfds, max_fileno);
+                       afsss = AFS_SOCKET_CHECK_FOR_WRITE;
+               }
        }
-       return ret;
+       return tv;
+}
+
+static int recv_afs_msg(int *fd, uint32_t *code, uint32_t *data)
+{
+       char control[255], buf[8];
+       struct msghdr msg = {.msg_iov = NULL};
+       struct cmsghdr *cmsg;
+       struct iovec iov;
+       int ret = 0;
+
+       iov.iov_base = buf;
+       iov.iov_len = sizeof(buf);
+       msg.msg_iov = &iov;
+       msg.msg_iovlen = 1;
+       msg.msg_control = control;
+       msg.msg_controllen = sizeof(control);
+       memset(buf, 0, sizeof(buf));
+       ret = recvmsg(afs_socket, &msg, 0);
+       if (ret < 0)
+               return -ERRNO_TO_PARA_ERROR(errno);
+       if (iov.iov_len != sizeof(buf))
+               return -E_SHORT_AFS_READ;
+       *code = *(uint32_t*)buf;
+       *data =  *(uint32_t*)(buf + 4);
+       cmsg = CMSG_FIRSTHDR(&msg);
+       for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
+               if (cmsg->cmsg_level != SOL_SOCKET
+                       || cmsg->cmsg_type != SCM_RIGHTS)
+               continue;
+               if ((cmsg->cmsg_len - CMSG_LEN(0)) / sizeof(int) != 1)
+               continue;
+               *fd = *(int *)CMSG_DATA(cmsg);
+       }
+       return 1;
+}
+
+static void recv_afs_result(void)
+{
+       int ret, passed_fd = -1, shmid;
+       uint32_t afs_code = 0, afs_data = 0;
+       struct stat statbuf;
+       struct timeval now;
+
+       PARA_NOTICE_LOG("recv\n");
+       ret = recv_afs_msg(&passed_fd, &afs_code, &afs_data);
+       if (ret < 0)
+               goto err;
+       PARA_NOTICE_LOG("got the fd: %d, code: %u, shmid: %u\n",
+               passed_fd, afs_code, afs_data);
+       ret = -E_BAD_AFS_CODE;
+       if (afs_code != NEXT_AUDIO_FILE)
+               goto err;
+       afsss = AFS_SOCKET_READY;
+       shmid = afs_data;
+       ret = load_afd(shmid, &mmd->afd);
+       if (ret < 0)
+               goto err;
+       shm_destroy(shmid);
+       PARA_NOTICE_LOG("next audio file: %s (%lu chunks)\n", mmd->afd.path,
+               mmd->afd.afhi.chunks_total);
+       ret = fstat(passed_fd, &statbuf);
+       if (ret < 0) {
+               ret = -ERRNO_TO_PARA_ERROR(errno);
+               goto err;
+       }
+       mmd->size = statbuf.st_size;
+       mmd->mtime = statbuf.st_mtime;
+       map = para_mmap(mmd->size, PROT_READ, MAP_PRIVATE,
+               passed_fd, 0);
+       strcpy(mmd->filename, mmd->afd.path); /* FIXME: check length */
+       mmd->afi.header_len = 0; /* default: no header */
+       mmd->audio_format = mmd->afd.afsi.audio_format_id;
+       mmd->chunks_sent = 0;
+       mmd->current_chunk = 0;
+       mmd->offset = 0;
+       mmd->events++;
+       mmd->num_played++;
+       mmd->afi = mmd->afd.afhi;
+       mmd->new_vss_status_flags &= (~VSS_NEXT);
+       gettimeofday(&now, NULL);
+       tv_add(&now, &announce_tv, &data_send_barrier);
+       return;
+err:
+       if (passed_fd >= 0)
+               close(passed_fd);
+       PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+}
+
+void vss_post_select(fd_set *rfds, fd_set *wfds)
+{
+       int ret;
+
+       if (FD_ISSET(afs_socket, rfds))
+               recv_afs_result();
+       if (afsss != AFS_SOCKET_CHECK_FOR_WRITE || !FD_ISSET(afs_socket, wfds))
+               return;
+       PARA_NOTICE_LOG("requesting new socket\n");
+       ret = send_buffer(afs_socket, "new");
+       afsss = AFS_SOCKET_AFD_PENDING;
 }
 
 static void get_chunk(long unsigned chunk_num, char **buf, size_t *len)
@@ -564,6 +587,10 @@ static void get_chunk(long unsigned chunk_num, char **buf, size_t *len)
        size_t pos = mmd->afi.chunk_table[chunk_num];
        *buf = map + pos;
        *len = mmd->afi.chunk_table[chunk_num + 1] - pos;
+
+       if (chunk_num + 5 > mmd->afd.afhi.chunks_total)
+               PARA_NOTICE_LOG("chunk %lu/%lu\n, len: %zu\n", chunk_num,
+                       mmd->afd.afhi.chunks_total, *len);
 }
 
 /**
@@ -597,12 +624,12 @@ int vss_get_chunk(long unsigned chunk_num, char **buf, size_t *len)
 void vss_send_chunk(void)
 {
        int i;
-       struct audio_format_handler *af;
        struct timeval now, due;
+       char *buf;
+       size_t len;
 
        if (mmd->audio_format < 0 || !map || !vss_playing())
                return;
-       af = &afl[mmd->audio_format];
        gettimeofday(&now, NULL);
        vss_next_chunk_time(&due);
        if (tv_diff(&due, &now, NULL) > 0)
@@ -628,12 +655,9 @@ void vss_send_chunk(void)
                mmd->offset = tv2ms(&tmp);
                mmd->events++;
        }
-       for (i = 0; senders[i].name; i++) {
-               char *buf;
-               size_t len;
-               get_chunk(mmd->current_chunk, &buf, &len);
+       get_chunk(mmd->current_chunk, &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;
        mmd->chunks_sent++;
        mmd->current_chunk++;