#include "bluesky.h"
extern BlueSkyFS *fs;
+static int outstanding_rpcs = 0;
+
/* TCP port number to use for NFS protocol. (Should be 2049.) */
#define NFS_SERVICE_PORT 2051
static void async_rpc_write(RPCConnection *rpc,
const char *buf, gsize len);
+static void async_rpc_flush(RPCConnection *rpc);
struct rpc_fail_reply {
uint32_t xid;
{
struct rpc_fail_reply header;
+ g_atomic_int_add(&outstanding_rpcs, -1);
+
header.xid = htonl(req->xid);
header.type = htonl(1); /* REPLY */
header.stat = htonl(MSG_ACCEPTED);
g_mutex_lock(req->connection->send_lock);
uint32_t fragment = htonl(sizeof(header) | 0x80000000);
- async_rpc_write(req->connection, (const char *)&fragment, sizeof(fragment));
+ if (!req->connection->udp_transport)
+ async_rpc_write(req->connection, (const char *)&fragment,
+ sizeof(fragment));
async_rpc_write(req->connection, (const char *)&header, sizeof(header));
- g_io_channel_flush(req->connection->channel, NULL);
+ async_rpc_flush(req->connection);
g_mutex_unlock(req->connection->send_lock);
if (req->args != NULL) {
g_free(c);
}
+ if (req->connection->udp_transport) {
+ /* For UDP, a connection only exists for the duration of a single
+ * message. */
+ g_mutex_free(req->connection->send_lock);
+ g_string_free(req->connection->sendbuf, TRUE);
+ g_free(req->connection);
+ }
+
g_free(req);
}
return;
}
+ g_atomic_int_add(&outstanding_rpcs, -1);
+
struct rpc_reply header;
header.xid = htonl(req->xid);
header.type = htonl(1); /* REPLY */
g_mutex_lock(req->connection->send_lock);
gsize msg_size = str->len;
uint32_t fragment = htonl((msg_size + sizeof(header)) | 0x80000000);
- async_rpc_write(req->connection, (const char *)&fragment, sizeof(fragment));
+ if (!req->connection->udp_transport)
+ async_rpc_write(req->connection, (const char *)&fragment,
+ sizeof(fragment));
async_rpc_write(req->connection, (const char *)&header, sizeof(header));
async_rpc_write(req->connection, str->str, str->len);
- g_io_channel_flush(req->connection->channel, NULL);
+ async_rpc_flush(req->connection);
g_mutex_unlock(req->connection->send_lock);
time_end = bluesky_now_hires();
+#if 0
printf("RPC[%"PRIx32"]: time = %"PRId64" ns\n",
req->xid, time_end - req->time_start);
+#endif
/* Clean up. */
g_string_free(str, TRUE);
g_free(c);
}
+ if (req->connection->udp_transport) {
+ /* For UDP, a connection only exists for the duration of a single
+ * message. */
+ g_mutex_free(req->connection->send_lock);
+ g_string_free(req->connection->sendbuf, TRUE);
+ g_free(req->connection);
+ }
+
g_free(req);
}
xdrproc_t _xdr_argument, _xdr_result;
char *(*local)(char *, RPCRequest *);
+#if 0
if (req->req_proc < sizeof(nfs_proc_names) / sizeof(const char *)) {
printf("Dispatched NFS RPC message type %s\n",
nfs_proc_names[req->req_proc]);
} else {
printf("Dispatched unknown NFS RPC message type %d\n", req->req_proc);
}
+#endif
switch (req->req_proc) {
case NFSPROC3_NULL:
static gboolean async_flushd(gpointer data)
{
+#if 0
+ int rpc_count = g_atomic_int_get(&outstanding_rpcs);
+ if (rpc_count != 0) {
+ g_print("Currently outstanding RPC requests: %d\n", rpc_count);
+ }
+#endif
+
if (fs_dump_requested) {
bluesky_debug_dump(fs);
fs_dump_requested = 0;
main_context = g_main_context_new();
main_loop = g_main_loop_new(main_context, FALSE);
- rpc_thread_pool = g_thread_pool_new(async_rpc_task, NULL, -1, FALSE, NULL);
+ rpc_thread_pool = g_thread_pool_new(async_rpc_task, NULL,
+ bluesky_max_threads, FALSE, NULL);
/* Arrange to have the cache writeback code run every five seconds. */
GSource *source = g_timeout_source_new_seconds(5);
return FALSE;
}
+ g_atomic_int_add(&outstanding_rpcs, 1);
+
RPCRequest *req = g_new0(RPCRequest, 1);
req->connection = rpc;
req->time_start = time_start;
buf += sizeof(struct rpc_call_header);
for (i = 0; i < 2; i++) {
struct rpc_auth *auth = (struct rpc_auth *)buf;
- if (buf - msg->str + sizeof(struct rpc_auth) > msg->len)
+ if (buf - msg->str + sizeof(struct rpc_auth) > msg->len) {
+ g_atomic_int_add(&outstanding_rpcs, -1);
return FALSE;
+ }
gsize authsize = ntohl(auth->len) + sizeof(struct rpc_auth);
- if (authsize > MAX_RPC_MSGSIZE)
+ if (authsize > MAX_RPC_MSGSIZE) {
+ g_atomic_int_add(&outstanding_rpcs, -1);
return FALSE;
+ }
buf += authsize;
}
- if (buf - msg->str > msg->len)
+ if (buf - msg->str > msg->len) {
+ g_atomic_int_add(&outstanding_rpcs, -1);
return FALSE;
+ }
req->raw_args = msg;
req->raw_args_header_bytes = buf - msg->str;
static void async_rpc_write(RPCConnection *rpc,
const char *buf, gsize len)
{
+ if (rpc->udp_transport) {
+ g_string_append_len(rpc->sendbuf, buf, len);
+ return;
+ }
+
+ /* Normal TCP path */
while (len > 0) {
gsize written = 0;
switch (g_io_channel_write_chars(rpc->channel, buf, len,
// g_io_channel_flush(rpc->channel, NULL);
}
+/* Flush a completed message out to the RPC socket */
+static void async_rpc_flush(RPCConnection *rpc)
+{
+ if (rpc->udp_transport) {
+ sendto(g_io_channel_unix_get_fd(rpc->channel),
+ rpc->sendbuf->str, rpc->sendbuf->len, 0,
+ (struct sockaddr *)&rpc->peer, sizeof(struct sockaddr_in));
+ return;
+ } else {
+ g_io_channel_flush(rpc->channel, NULL);
+ }
+}
+
static gboolean async_rpc_do_read(GIOChannel *channel,
GIOCondition condition,
gpointer data)
g_source_unref(source);
}
+static gboolean async_rpc_do_udp(GIOChannel *channel,
+ GIOCondition condition,
+ gpointer data)
+{
+ char buf[65536];
+
+ struct sockaddr_in src;
+ socklen_t addrlen = sizeof(struct sockaddr_in);
+ ssize_t len = recvfrom(g_io_channel_unix_get_fd(channel),
+ buf, sizeof(buf), 0,
+ (struct sockaddr *)&src, &addrlen);
+ if (len < 0) {
+ fprintf(stderr, "UDP read error: %m, shutting down UDP\n");
+ return FALSE;
+ }
+
+ g_assert(len < sizeof(buf));
+
+ RPCConnection *rpc = g_new0(RPCConnection, 1);
+ rpc->channel = channel;
+ rpc->msgbuf = g_string_new_len(buf, len);
+ rpc->send_lock = g_mutex_new();
+ rpc->udp_transport = TRUE;
+ memcpy(&rpc->peer, &src, sizeof(struct sockaddr_in));
+ rpc->sendbuf = g_string_new("");
+
+ /* We have a complete message since this was the last fragment and
+ * there are no more bytes in it. Dispatch the message. */
+ async_rpc_dispatch(rpc);
+
+ return TRUE;
+}
+
+static async_rpc_register_listening_udp(int fd)
+{
+ GIOChannel *channel = g_io_channel_unix_new(fd);
+ g_io_channel_set_encoding(channel, NULL, NULL);
+ GSource *source = g_io_create_watch(channel, G_IO_IN);
+ g_source_set_callback(source, (GSourceFunc)async_rpc_do_udp,
+ NULL, NULL);
+ g_source_attach(source, main_context);
+ g_source_unref(source);
+}
+
static gpointer async_rpc_run(gpointer data)
{
g_print("Starting NFS main loop...\n");
async_rpc_register_listening(fd);
+ /* Minimal UDP NFSv3 support */
+ fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+ if (fd < 0) {
+ fprintf(stderr, "Unable to create NFS UDP socket: %m\n");
+ exit(1);
+ }
+
+ addr.sin_family = AF_INET;
+ addr.sin_port = htons(NFS_SERVICE_PORT);
+ addr.sin_addr.s_addr = INADDR_ANY;
+ if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
+ fprintf(stderr, "Unable to bind to NFS UDP address: %m\n");
+ exit(1);
+ }
+
+ if (!pmap_set(NFS_PROGRAM, NFS_V3, IPPROTO_UDP, NFS_SERVICE_PORT)) {
+ fprintf(stderr, "Could not register NFS UDP RPC service!\n");
+ exit(1);
+ }
+
+ async_rpc_register_listening_udp(fd);
+
g_thread_create(async_rpc_run, NULL, TRUE, NULL);
}
projects / bluesky.git / blobdiff