uint32_t accept_stat;
};
+/* Routines for XDR-encoding to a growable string. */
+static bool_t xdr_string_putlong(XDR *xdrs, const long *lp)
+{
+ GString *str = (GString *)xdrs->x_private;
+ uint32_t data = htonl(*lp);
+ g_string_set_size(str, str->len + 4);
+ memcpy(str->str + str->len - 4, &data, 4);
+ return TRUE;
+}
+
+static bool_t xdr_string_putbytes(XDR *xdrs, const char *addr, u_int len)
+{
+ GString *str = (GString *)xdrs->x_private;
+ g_string_set_size(str, str->len + len);
+ memcpy(str->str + str->len - len, addr, len);
+ return TRUE;
+}
+
+static u_int xdr_string_getpos(const XDR *xdrs)
+{
+ GString *str = (GString *)xdrs->x_private;
+ return str->len;
+}
+
+static bool_t xdr_string_putint32(XDR *xdrs, const int32_t *ip)
+{
+ GString *str = (GString *)xdrs->x_private;
+ uint32_t data = htonl(*ip);
+ g_string_set_size(str, str->len + 4);
+ memcpy(str->str + str->len - 4, &data, 4);
+ return TRUE;
+}
+
+static int32_t *xdr_string_inline(XDR *xdrs, u_int len)
+{
+ GString *str = (GString *)xdrs->x_private;
+ g_string_set_size(str, str->len + len);
+ return (int32_t *)(str->str + str->len - len);
+}
+
+static void xdr_string_destroy(XDR *xdrs)
+{
+}
+
+static struct xdr_ops xdr_string_ops = {
+ .x_putlong = xdr_string_putlong,
+ .x_putbytes = xdr_string_putbytes,
+ .x_getpostn = xdr_string_getpos,
+ .x_putint32 = xdr_string_putint32,
+ .x_inline = xdr_string_inline,
+ .x_destroy = xdr_string_destroy,
+};
+
+static void xdr_string_create(XDR *xdrs, GString *string, enum xdr_op op)
+{
+ xdrs->x_op = op;
+ xdrs->x_ops = &xdr_string_ops;
+ xdrs->x_private = (char *)string;
+ xdrs->x_base = NULL;
+ xdrs->x_handy = 0;
+}
+
static void
async_rpc_send_failure(RPCRequest *req, enum accept_stat stat)
{
struct rpc_fail_reply header;
- fprintf(stderr, "Sending RPC failure status %d\n", stat);
-
header.xid = htonl(req->xid);
header.type = htonl(1); /* REPLY */
header.stat = htonl(MSG_ACCEPTED);
if (req->raw_args != NULL)
g_string_free(req->raw_args, TRUE);
+ while (req->cleanup != NULL) {
+ struct cleanup_list *c = req->cleanup;
+ req->cleanup = c->next;
+ c->func(c->arg);
+ g_free(c);
+ }
+
g_free(req);
}
void
async_rpc_send_reply(RPCRequest *req, void *result)
{
- static char reply_buf[MAX_RPC_MSGSIZE];
+ bluesky_time_hires time_end;
+
+ GString *str = g_string_new("");
XDR xdr_out;
- xdrmem_create(&xdr_out, reply_buf, MAX_RPC_MSGSIZE, XDR_ENCODE);
+ xdr_string_create(&xdr_out, str, XDR_ENCODE);
if (!req->xdr_result(&xdr_out, result)) {
async_rpc_send_failure(req, SYSTEM_ERR);
+ g_string_free(str, TRUE);
return;
}
header.verf_len = 0;
header.accept_stat = 0;
- gsize msg_size = xdr_out.x_ops->x_getpostn(&xdr_out);
- printf("Have an RPC reply of size %zd bytes\n", msg_size);
+ gsize msg_size = str->len;
uint32_t fragment = htonl((msg_size + sizeof(header)) | 0x80000000);
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, reply_buf, msg_size);
+ async_rpc_write(req->connection, str->str, str->len);
g_io_channel_flush(req->connection->channel, NULL);
+ time_end = bluesky_now_hires();
+
+ printf("RPC[%"PRIx32"]: time = %"PRId64" ns\n",
+ req->xid, time_end - req->time_start);
+
/* Clean up. */
+ g_string_free(str, TRUE);
+
if (req->args != NULL) {
char buf[4];
XDR xdr;
if (req->raw_args != NULL)
g_string_free(req->raw_args, TRUE);
+ while (req->cleanup != NULL) {
+ struct cleanup_list *c = req->cleanup;
+ req->cleanup = c->next;
+ c->func(c->arg);
+ g_free(c);
+ }
+
g_free(req);
}
xdrproc_t _xdr_argument, _xdr_result;
char *(*local)(char *, RPCRequest *);
+ printf("Dispatched NFS RPC message type %d\n", req->req_proc);
+
switch (req->req_proc) {
case NFSPROC3_NULL:
_xdr_argument = (xdrproc_t) xdr_void;
req->xdr_result = _xdr_result;
result = (*local)((char *)req->args, req);
- bluesky_flushd_invoke(fs);
+ bluesky_debug_dump(fs);
return;
}
static GMainContext *main_context;
static GMainLoop *main_loop;
+static gboolean async_flushd(gpointer data)
+{
+ bluesky_flushd_invoke(fs);
+ return TRUE;
+}
+
static async_rpc_init()
{
main_context = g_main_context_new();
main_loop = g_main_loop_new(main_context, FALSE);
+
+ /* Arrange to have the cache writeback code run every five seconds. */
+ GSource *source = g_timeout_source_new_seconds(5);
+ g_source_set_callback(source, async_flushd, NULL, NULL);
+ g_source_attach(source, main_context);
+ g_source_unref(source);
}
struct rpc_call_header {
* and the transport should be closed. */
static gboolean async_rpc_dispatch(RPCConnection *rpc)
{
+ bluesky_time_hires time_start = bluesky_now_hires();
int i;
GString *msg = rpc->msgbuf;
const char *buf = msg->str;
RPCRequest *req = g_new0(RPCRequest, 1);
req->connection = rpc;
+ req->time_start = time_start;
req->xid = xid;
if (ntohl(header->prog) != NFS_PROGRAM) {
if (buf - msg->str > msg->len)
return FALSE;
- printf("Dispatching RPC procedure %d...\n", proc);
-
req->raw_args = msg;
req->raw_args_header_bytes = buf - msg->str;
req->req_proc = ntohl(header->proc);
rpc->frag_len = ntohl(rpc->frag_len);
g_string_set_size(rpc->msgbuf, rpc->msgbuf->len - 4);
rpc->frag_hdr_bytes = 0;
- g_print("RPC fragment header: %08x\n", rpc->frag_len);
}
} else {
/* We were reading in the fragment body. */
if (rpc->frag_len = 0x80000000) {
/* We have a complete message since this was the last fragment and
* there are no more bytes in it. Dispatch the message. */
- g_print("Complete RPC message: %zd bytes\n", rpc->msgbuf->len);
if (!async_rpc_dispatch(rpc)) {
fprintf(stderr, "Invalid RPC message, closing channel\n");
g_io_channel_shutdown(rpc->channel, TRUE, NULL);
projects / bluesky.git / blobdiff