git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
lib
/
stream-fd.c
diff --git
a/lib/stream-fd.c
b/lib/stream-fd.c
index
94c8434
..
8062d2d
100644
(file)
--- a/
lib/stream-fd.c
+++ b/
lib/stream-fd.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009
Nicira Networks
.
+ * Copyright (c) 2008, 2009
, 2010, 2012, 2013, 2014 Nicira, Inc
.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-16,23
+16,22
@@
#include <config.h>
#include "stream-fd.h"
#include <config.h>
#include "stream-fd.h"
-#include <assert.h>
#include <errno.h>
#include <poll.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <poll.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/socket.h>
#include <sys/types.h>
#include <unistd.h>
#include "fatal-signal.h"
#include <sys/types.h>
#include <unistd.h>
#include "fatal-signal.h"
-#include "leak-checker.h"
#include "poll-loop.h"
#include "socket-util.h"
#include "util.h"
#include "stream-provider.h"
#include "stream.h"
#include "poll-loop.h"
#include "socket-util.h"
#include "util.h"
#include "stream-provider.h"
#include "stream.h"
-
#include "vlog.h"
#include "vlog.h"
-#define THIS_MODULE VLM_stream_fd
+
+VLOG_DEFINE_THIS_MODULE(stream_fd);
/* Active file descriptor stream. */
/* Active file descriptor stream. */
@@
-40,10
+39,9
@@
struct stream_fd
{
struct stream stream;
int fd;
{
struct stream stream;
int fd;
- char *unlink_path;
};
};
-static struct stream_class stream_fd_class;
+static
const
struct stream_class stream_fd_class;
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(10, 25);
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(10, 25);
@@
-53,21
+51,17
@@
static void maybe_unlink_and_free(char *path);
* and stores a pointer to the stream in '*streamp'. Initial connection status
* 'connect_status' is interpreted as described for stream_init().
*
* and stores a pointer to the stream in '*streamp'. Initial connection status
* 'connect_status' is interpreted as described for stream_init().
*
- * When '*streamp' is closed, then 'unlink_path' (if nonnull) will be passed to
- * fatal_signal_unlink_file_now() and then freed with free().
- *
* Returns 0 if successful, otherwise a positive errno value. (The current
* implementation never fails.) */
int
new_fd_stream(const char *name, int fd, int connect_status,
* Returns 0 if successful, otherwise a positive errno value. (The current
* implementation never fails.) */
int
new_fd_stream(const char *name, int fd, int connect_status,
-
char *unlink_path,
struct stream **streamp)
+ struct stream **streamp)
{
struct stream_fd *s;
s = xmalloc(sizeof *s);
stream_init(&s->stream, &stream_fd_class, connect_status, name);
s->fd = fd;
{
struct stream_fd *s;
s = xmalloc(sizeof *s);
stream_init(&s->stream, &stream_fd_class, connect_status, name);
s->fd = fd;
- s->unlink_path = unlink_path;
*streamp = &s->stream;
return 0;
}
*streamp = &s->stream;
return 0;
}
@@
-84,7
+78,6
@@
fd_close(struct stream *stream)
{
struct stream_fd *s = stream_fd_cast(stream);
close(s->fd);
{
struct stream_fd *s = stream_fd_cast(stream);
close(s->fd);
- maybe_unlink_and_free(s->unlink_path);
free(s);
}
free(s);
}
@@
-99,7
+92,9
@@
static ssize_t
fd_recv(struct stream *stream, void *buffer, size_t n)
{
struct stream_fd *s = stream_fd_cast(stream);
fd_recv(struct stream *stream, void *buffer, size_t n)
{
struct stream_fd *s = stream_fd_cast(stream);
- ssize_t retval = read(s->fd, buffer, n);
+ ssize_t retval;
+
+ retval = read(s->fd, buffer, n);
return retval >= 0 ? retval : -errno;
}
return retval >= 0 ? retval : -errno;
}
@@
-107,7
+102,9
@@
static ssize_t
fd_send(struct stream *stream, const void *buffer, size_t n)
{
struct stream_fd *s = stream_fd_cast(stream);
fd_send(struct stream *stream, const void *buffer, size_t n)
{
struct stream_fd *s = stream_fd_cast(stream);
- ssize_t retval = write(s->fd, buffer, n);
+ ssize_t retval;
+
+ retval = write(s->fd, buffer, n);
return (retval > 0 ? retval
: retval == 0 ? -EAGAIN
: -errno);
return (retval > 0 ? retval
: retval == 0 ? -EAGAIN
: -errno);
@@
-128,12
+125,13
@@
fd_wait(struct stream *stream, enum stream_wait_type wait)
break;
default:
break;
default:
- NOT_REACHED();
+
OVS_
NOT_REACHED();
}
}
}
}
-static struct stream_class stream_fd_class = {
+static
const
struct stream_class stream_fd_class = {
"fd", /* name */
"fd", /* name */
+ false, /* needs_probes */
NULL, /* open */
fd_close, /* close */
fd_connect, /* connect */
NULL, /* open */
fd_close, /* close */
fd_connect, /* connect */
@@
-150,12
+148,13
@@
struct fd_pstream
{
struct pstream pstream;
int fd;
{
struct pstream pstream;
int fd;
- int (*accept_cb)(int fd, const struct sockaddr
*, size_t sa
_len,
+ int (*accept_cb)(int fd, const struct sockaddr
_storage *, size_t ss
_len,
struct stream **);
struct stream **);
+ int (*set_dscp_cb)(int fd, uint8_t dscp);
char *unlink_path;
};
char *unlink_path;
};
-static struct pstream_class fd_pstream_class;
+static
const
struct pstream_class fd_pstream_class;
static struct fd_pstream *
fd_pstream_cast(struct pstream *pstream)
static struct fd_pstream *
fd_pstream_cast(struct pstream *pstream)
@@
-180,14
+179,16
@@
fd_pstream_cast(struct pstream *pstream)
* implementation never fails.) */
int
new_fd_pstream(const char *name, int fd,
* implementation never fails.) */
int
new_fd_pstream(const char *name, int fd,
- int (*accept_cb)(int fd, const struct sockaddr *sa,
- size_t sa_len, struct stream **streamp),
+ int (*accept_cb)(int fd, const struct sockaddr_storage *ss,
+ size_t ss_len, struct stream **streamp),
+ int (*set_dscp_cb)(int fd, uint8_t dscp),
char *unlink_path, struct pstream **pstreamp)
{
struct fd_pstream *ps = xmalloc(sizeof *ps);
pstream_init(&ps->pstream, &fd_pstream_class, name);
ps->fd = fd;
ps->accept_cb = accept_cb;
char *unlink_path, struct pstream **pstreamp)
{
struct fd_pstream *ps = xmalloc(sizeof *ps);
pstream_init(&ps->pstream, &fd_pstream_class, name);
ps->fd = fd;
ps->accept_cb = accept_cb;
+ ps->set_dscp_cb = set_dscp_cb;
ps->unlink_path = unlink_path;
*pstreamp = &ps->pstream;
return 0;
ps->unlink_path = unlink_path;
*pstreamp = &ps->pstream;
return 0;
@@
-213,9
+214,9
@@
pfd_accept(struct pstream *pstream, struct stream **new_streamp)
new_fd = accept(ps->fd, (struct sockaddr *) &ss, &ss_len);
if (new_fd < 0) {
new_fd = accept(ps->fd, (struct sockaddr *) &ss, &ss_len);
if (new_fd < 0) {
-
int
retval = errno;
+ retval = errno;
if (retval != EAGAIN) {
if (retval != EAGAIN) {
- VLOG_DBG_RL(&rl, "accept: %s", strerror(retval));
+ VLOG_DBG_RL(&rl, "accept: %s",
ovs_
strerror(retval));
}
return retval;
}
}
return retval;
}
@@
-226,8
+227,7
@@
pfd_accept(struct pstream *pstream, struct stream **new_streamp)
return retval;
}
return retval;
}
- return ps->accept_cb(new_fd, (const struct sockaddr *) &ss, ss_len,
- new_streamp);
+ return ps->accept_cb(new_fd, &ss, ss_len, new_streamp);
}
static void
}
static void
@@
-237,12
+237,24
@@
pfd_wait(struct pstream *pstream)
poll_fd_wait(ps->fd, POLLIN);
}
poll_fd_wait(ps->fd, POLLIN);
}
-static struct pstream_class fd_pstream_class = {
+static int
+pfd_set_dscp(struct pstream *pstream, uint8_t dscp)
+{
+ struct fd_pstream *ps = fd_pstream_cast(pstream);
+ if (ps->set_dscp_cb) {
+ return ps->set_dscp_cb(ps->fd, dscp);
+ }
+ return 0;
+}
+
+static const struct pstream_class fd_pstream_class = {
"pstream",
"pstream",
+ false,
NULL,
pfd_close,
pfd_accept,
NULL,
pfd_close,
pfd_accept,
- pfd_wait
+ pfd_wait,
+ pfd_set_dscp,
};
\f
/* Helper functions. */
};
\f
/* Helper functions. */