Merge pull request #413 from Peter-JanGootzen/rebased

Added NFS 4.1 operations, fixed incomplete open_claim4 and added poll_timeout param

Author: sahlberg

include/libnfs-private.h

@@ -166,6 +166,7 @@ struct rpc_context {
         uint64_t last_timeout_scan;
 	int timeout;
 	char ifname[IFNAMSIZ];
+	int poll_timeout;
 
         /* Is a server context ? */
         int is_server_context;
@@ -271,6 +272,8 @@ void rpc_set_pagecache(struct rpc_context *rpc, uint32_t v);
 void rpc_set_pagecache_ttl(struct rpc_context *rpc, uint32_t v);
 void rpc_set_readahead(struct rpc_context *rpc, uint32_t v);
 void rpc_set_debug(struct rpc_context *rpc, int level);
+void rpc_set_poll_timeout(struct rpc_context *rpc, int poll_timeout);
+int rpc_get_poll_timeout(struct rpc_context *rpc);
 void rpc_set_timeout(struct rpc_context *rpc, int timeout);
 int rpc_get_timeout(struct rpc_context *rpc);
 int rpc_add_fragment(struct rpc_context *rpc, char *data, uint32_t size);

include/nfsc/libnfs.h

@@ -1988,6 +1988,27 @@ struct nfs_server_list {
 struct nfs_server_list *nfs_find_local_servers(void);
 void free_nfs_srvr_list(struct nfs_server_list *srv);
 
+/*
+ * nfs_set_poll_timeout()
+ * This function sets the polling timeout used for nfs rpc calls.
+ *
+ * Function returns nothing.
+ *
+ * int milliseconds : timeout that is passed to poll(2)
+ *                    to be applied in milliseconds (-1 no timeout)
+ */
+EXTERN void nfs_set_poll_timeout(struct nfs_context *nfs, int milliseconds);
+
+/*
+ * nfs_get_poll_timeout()
+ * This function gets the polling timeout used for nfs rpc calls.
+ *
+ * Function returns:
+ * int milliseconds : timeout that is passed to poll(2)
+ *                    to be applied in milliseconds (-1 no timeout)
+ */
+EXTERN int nfs_get_poll_timeout(struct nfs_context *nfs);
+
 /*
  * sync nfs_set_timeout()
  * This function sets the timeout used for nfs rpc calls.

lib/init.c

@@ -147,6 +147,8 @@ struct rpc_context *rpc_init_context(void)
 
 	/* Default is no timeout */
 	rpc->timeout = -1;
+	/* Default is to timeout after 100ms of poll(2) */
+	rpc->poll_timeout = 100;
 
 	return rpc;
 }
@@ -472,6 +474,20 @@ void rpc_destroy_context(struct rpc_context *rpc)
 	free(rpc);
 }
 
+void rpc_set_poll_timeout(struct rpc_context *rpc, int poll_timeout)
+{
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
+	rpc->poll_timeout = poll_timeout;
+}
+
+int rpc_get_poll_timeout(struct rpc_context *rpc)
+{
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
+	return rpc->poll_timeout;
+}
+
 void rpc_set_timeout(struct rpc_context *rpc, int timeout)
 {
 	assert(rpc->magic == RPC_CONTEXT_MAGIC);

lib/libnfs-sync.c

@@ -225,7 +225,7 @@ wait_for_reply(struct rpc_context *rpc, struct sync_cb_data *cb_data)
 		pfd.events  = rpc_which_events(rpc);
 		pfd.revents = 0;
 
-		ret = poll(&pfd, 1, 100);
+		ret = poll(&pfd, 1, rpc->poll_timeout);
 		if (ret < 0) {
 			rpc_set_error(rpc, "Poll failed");
 			revents = -1;
@@ -271,7 +271,7 @@ wait_for_nfs_reply(struct nfs_context *nfs, struct sync_cb_data *cb_data)
 		pfd.events = nfs_which_events(nfs);
 		pfd.revents = 0;
 
-		ret = poll(&pfd, 1, 100);
+		ret = poll(&pfd, 1, nfs->rpc->poll_timeout);
 		if (ret < 0) {
 			nfs_set_error(nfs, "Poll failed");
 			revents = -1;

lib/libnfs.c

@@ -2155,13 +2155,31 @@ nfs_umask(struct nfs_context *nfs, uint16_t mask) {
 	 return tmp;
 }
 
+/*
+* Sets polling timeout for nfs apis
+*/
+void
+nfs_set_poll_timeout(struct nfs_context *nfs, int poll_timeout)
+{
+	rpc_set_timeout(nfs->rpc,poll_timeout);
+}
+
+/*
+* Gets polling timeout for nfs apis
+*/
+int
+nfs_get_poll_timeout(struct nfs_context *nfs)
+{
+	return rpc_get_poll_timeout(nfs->rpc);
+}
+
 /*
 * Sets timeout for nfs apis
 */
 void
 nfs_set_timeout(struct nfs_context *nfs,int timeout)
 {
-	 rpc_set_timeout(nfs->rpc,timeout);
+	rpc_set_timeout(nfs->rpc,timeout);
 }
 
 /*

lib/multithreading.c

@@ -84,9 +84,8 @@ static void *nfs_mt_service_thread(void *arg)
 		pfd.fd = nfs_get_fd(nfs);
 		pfd.events = nfs_which_events(nfs);
 		pfd.revents = 0;
-
-		// Wake up at least every 100ms to process timeouts.
-		ret = poll(&pfd, 1, 100);
+        
+		ret = poll(&pfd, 1, nfs->rpc->poll_timeout);
 		if (ret < 0) {
 			nfs_set_error(nfs, "Poll failed");
 			revents = -1;