projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 a55e09151a35e116fe17445721348970f32330bc..1be4cd15d1db262dd5f79a43b19e7bba09f2087a 100644
(file)
--- a/
vss.c
+++ b/
vss.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 1997-200
7
Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-200
8
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"
@@
-142,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
@@
-176,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 */
@@
-221,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);
}
/**
}
/**
@@
-362,7
+351,7
@@
static int recv_afs_msg(int *fd, uint32_t *code, uint32_t *data)
return -ERRNO_TO_PARA_ERROR(errno);
afsss = AFS_SOCKET_READY;
if (iov.iov_len != sizeof(buf))
return -ERRNO_TO_PARA_ERROR(errno);
afsss = AFS_SOCKET_READY;
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)) {
@@
-383,6
+372,7
@@
static void recv_afs_result(void)
struct stat statbuf;
struct timeval now;
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;
@@
-419,6
+409,7
@@
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);
PARA_ERROR_LOG("%s\n", para_strerror(-ret));
if (passed_fd >= 0)
close(passed_fd);
PARA_ERROR_LOG("%s\n", para_strerror(-ret));
@@
-437,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.
*
@@
-460,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;
}
@@
-483,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)
@@
-498,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);
@@
-507,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;