Merge remote-tracking branch 'origin/master' into 1.6

Conflicts:
	src/box/iproto.cc

src/box/iproto.cc

@@ -116,7 +116,7 @@ struct IprotoMsgGuard {
 	{ struct iproto_msg *tmp = msg; msg = NULL; return tmp; }
 };
 
-enum { IPROTO_FIBER_POOL_SIZE = 1024 };
+enum { IPROTO_FIBER_POOL_SIZE = 1024, IPROTO_FIBER_POOL_IDLE_TIMEOUT = 3 };
 
 /* }}} */
 
@@ -838,7 +838,8 @@ iproto_init()
 	static struct cpipe_fiber_pool fiber_pool;
 
 	cpipe_fiber_pool_create(&fiber_pool, "iproto", &tx_pipe,
-				IPROTO_FIBER_POOL_SIZE);
+				IPROTO_FIBER_POOL_SIZE,
+				IPROTO_FIBER_POOL_IDLE_TIMEOUT);
 
 	static struct cord net_cord;
 	if (cord_costart(&net_cord, "iproto", net_cord_f, NULL))

src/cbus.cc

@@ -257,9 +257,13 @@ cpipe_fiber_pool_f(va_list ap)
 		rlist_add_entry(&pool->fiber_cache, fiber(), state);
 		pool->size--;
 		pool->cache_size++;
-		fiber_yield();
+		bool timed_out = fiber_yield_timeout(pool->idle_timeout);
 		pool->cache_size--;
 		pool->size++;
+		if (timed_out) {
+			/** Nothing to do for quite a while */
+			return;
+		}
 		goto restart;
 	}
 }
@@ -296,7 +300,7 @@ cpipe_fiber_pool_cb(ev_loop * /* loop */, struct ev_async *watcher,
 void
 cpipe_fiber_pool_create(struct cpipe_fiber_pool *pool,
 			const char *name, struct cpipe *pipe,
-			int max_pool_size)
+			int max_pool_size, float idle_timeout)
 {
 	rlist_create(&pool->fiber_cache);
 	pool->name = name;
@@ -304,5 +308,6 @@ cpipe_fiber_pool_create(struct cpipe_fiber_pool *pool,
 	pool->size = 0;
 	pool->cache_size = 0;
 	pool->max_size = max_pool_size;
+	pool->idle_timeout = idle_timeout;
 	cpipe_set_fetch_cb(pipe, cpipe_fiber_pool_cb, pool);
 }

src/cbus.h

@@ -457,6 +457,11 @@ struct cpipe_fiber_pool {
 	int cache_size;
 	/** The limit on the number of fibers working on tasks. */
 	int max_size;
+	/**
+	 * Fibers in leave the pool if they have nothing to do
+	 * for longer than this.
+	 */
+	float idle_timeout;
 	struct cpipe *pipe;
 };
 
@@ -467,6 +472,6 @@ struct cpipe_fiber_pool {
 void
 cpipe_fiber_pool_create(struct cpipe_fiber_pool *pool,
 			const char *name, struct cpipe *pipe,
-			int max_pool_size);
+			int max_pool_size, float idle_timeout);
 
 #endif /* TARANTOOL_CBUS_H_INCLUDED */