projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
convert para_audiod to the new scheduler.
[paraslash.git]
/
dccp_recv.c
diff --git
a/dccp_recv.c
b/dccp_recv.c
index 5cd523ae8cf2a1ace953bb0e85fb717620419efc..deca7162bfecc40e93dd0d7431f7bae9218f23ec 100644
(file)
--- a/
dccp_recv.c
+++ b/
dccp_recv.c
@@
-16,6
+16,8
@@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
+/** \file dccp_recv.c paraslash's dccp receiver */
+
/*
* based on client.c of dccp-cs-0.01.tar.bz2,
* (C) 2005 Ian McDonald <imcdnzl@gmail.com>
/*
* based on client.c of dccp-cs-0.01.tar.bz2,
* (C) 2005 Ian McDonald <imcdnzl@gmail.com>
@@
-24,9
+26,12
@@
#include "para.h"
#include "error.h"
#include "dccp.h"
#include "para.h"
#include "error.h"
#include "dccp.h"
+#include "list.h"
+#include "sched.h"
#include "recv.h"
#include "string.h"
#include "net.h"
#include "recv.h"
#include "string.h"
#include "net.h"
+#include "fd.h"
#include "dccp_recv.cmdline.h"
#include "dccp_recv.cmdline.h"
@@
-35,7
+40,7
@@
#include <sys/socket.h>
#include <netdb.h>
#include <sys/socket.h>
#include <netdb.h>
-
+/** the size of the output buffer */
#define DCCP_BUFSIZE 40960
/**
#define DCCP_BUFSIZE 40960
/**
@@
-66,7
+71,7
@@
static void dccp_recv_close(struct receiver_node *rn)
static int dccp_recv_open(struct receiver_node *rn)
{
struct private_dccp_recv_data *pdd;
static int dccp_recv_open(struct receiver_node *rn)
{
struct private_dccp_recv_data *pdd;
- struct
gengetopt
_args_info *conf = rn->conf;
+ struct
dccp_recv
_args_info *conf = rn->conf;
int ret;
struct addrinfo *ai;
char *tmp;
int ret;
struct addrinfo *ai;
char *tmp;
@@
-106,7
+111,7
@@
static void dccp_shutdown(void)
static void *dccp_recv_parse_config(int argc, char **argv)
{
static void *dccp_recv_parse_config(int argc, char **argv)
{
- struct
gengetopt_args_info *tmp = para_calloc(sizeof(struct gengetopt
_args_info));
+ struct
dccp_recv_args_info *tmp = para_calloc(sizeof(struct dccp_recv
_args_info));
if (!dccp_recv_cmdline_parser(argc, argv, tmp))
return tmp;
if (!dccp_recv_cmdline_parser(argc, argv, tmp))
return tmp;
@@
-114,35
+119,35
@@
static void *dccp_recv_parse_config(int argc, char **argv)
return NULL;
}
return NULL;
}
-static int dccp_recv_pre_select(struct receiver_node *rn, fd_set *rfds,
- __unused fd_set *wfds, __unused struct timeval *timeout)
+static void dccp_recv_pre_select(struct sched *s, struct task *t)
{
{
- struct private_dccp_recv_data *pdd =
rn
->private_data;
+ struct private_dccp_recv_data *pdd =
t
->private_data;
if (!pdd)
if (!pdd)
- return -1;
- FD_SET(pdd->fd, rfds);
- return pdd->fd;
+ return ;
+ para_fd_set(pdd->fd, &s->rfds, &s->max_fileno);
}
}
-static int dccp_recv_post_select(struct receiver_node *rn, int select_ret,
- fd_set *rfds, __unused fd_set *wfds)
+static void dccp_recv_post_select(struct sched *s, struct task *t)
{
{
-
int ret
;
+
struct receiver_node *rn = t->private_data
;
struct private_dccp_recv_data *pdd = rn->private_data;
struct private_dccp_recv_data *pdd = rn->private_data;
- if (!select_ret || !pdd || !FD_ISSET(pdd->fd, rfds))
- return 1; /* nothing to do */
+ t->ret = 1;
+ if (!s->select_ret || !pdd || !FD_ISSET(pdd->fd, &s->rfds))
+ return; /* nothing to do */
+ t->ret = -E_DCCP_OVERRUN;
if (rn->loaded >= DCCP_BUFSIZE)
if (rn->loaded >= DCCP_BUFSIZE)
- return
-E_DCCP_OVERRUN
;
- ret = recv_bin_buffer(pdd->fd, rn->buf + rn->loaded,
+ return;
+
t->
ret = recv_bin_buffer(pdd->fd, rn->buf + rn->loaded,
DCCP_BUFSIZE - rn->loaded);
DCCP_BUFSIZE - rn->loaded);
- if (ret <= 0) {
- PARA_INFO_LOG("%s\n", ret? PARA_STRERROR(-ret) : "eof");
- return ret;
+ if (t->ret <= 0) {
+ rn->eof = 1;
+ if (!t->ret)
+ t->ret = -E_DCCP_RECV_EOF;
+ return;
}
}
- rn->loaded += ret;
- return 1;
+ rn->loaded += t->ret;
}
/**
}
/**