Added setting for task tmpdir

Author: matyhtf

examples/task.php

@@ -3,6 +3,7 @@
 $serv->set(array(
     'worker_num' => 1,
     'task_worker_num' => 1,
+    //'task_tmpdir' => '/data/task/',
 ));
 $serv->on('Receive', function(swoole_server $serv, $fd, $from_id, $data) {
 	//AsyncTask
@@ -57,4 +58,3 @@
     }
 });
 $serv->start();
-

include/Server.h

@@ -462,7 +462,8 @@ int swTaskWorker_large_pack(swEventData *task, void *data, int data_len);
 #define swTaskWorker_large_unpack(task, __malloc, _buf, _length)   swPackage_task _pkg;\
 	memcpy(&_pkg, task->data, sizeof(_pkg));\
 	_length = _pkg.length;\
-	_buf = __malloc(_length);\
+	_buf = __malloc(_length + 1);\
+	_buf[_length] = 0;\
 	int tmp_file_fd = open(_pkg.tmpfile, O_RDONLY);\
 	if (tmp_file_fd < 0){\
 		swWarn("open(%s) failed. Error: %s[%d]", task->data, strerror(errno), errno);\

include/swoole.h

@@ -1115,12 +1115,15 @@ typedef struct
      * Timer used pipe
      */
     uint8_t use_timer_pipe;
-    uint8_t task_ipc_mode;
+
 
     /**
      *  task worker process num
      */
     uint16_t task_worker_num;
+    char *task_tmpdir;
+    uint16_t task_tmpdir_len;
+    uint8_t task_ipc_mode;
 
     uint16_t cpu_num;
 

php_swoole.h

@@ -37,7 +37,7 @@
 #include "Client.h"
 #include "async.h"
 
-#define PHP_SWOOLE_VERSION  "1.7.6"
+#define PHP_SWOOLE_VERSION  "1.7.7-alpha"
 #define PHP_SWOOLE_CHECK_CALLBACK
 
 /**

src/network/TaskWorker.c

@@ -44,7 +44,7 @@ int swTaskWorker_onTask(swProcessPool *pool, swEventData *task)
 int swTaskWorker_large_pack(swEventData *task, void *data, int data_len)
 {
 	swPackage_task pkg;
-	memcpy(pkg.tmpfile, SW_TASK_TMP_FILE, sizeof(SW_TASK_TMP_FILE));
+	memcpy(pkg.tmpfile, SwooleG.task_tmpdir, SwooleG.task_tmpdir_len);
 
 #ifdef HAVE_MKOSTEMP
 	int tpm_fd  = mkostemp(pkg.tmpfile, O_WRONLY);
@@ -85,22 +85,22 @@ static void swTaskWorker_signal_init(void)
 
 void swTaskWorker_onWorkerStart(swProcessPool *pool, int worker_id)
 {
-	swServer *serv = pool->ptr;
-	SwooleWG.id = worker_id + serv->worker_num;
+    swServer *serv = pool->ptr;
+    SwooleWG.id = worker_id + serv->worker_num;
 
-	SwooleG.use_timer_pipe = 0;
-	SwooleG.use_timerfd = 0;
+    SwooleG.use_timer_pipe = 0;
+    SwooleG.use_timerfd = 0;
 
-	swTaskWorker_signal_init();
-	swServer_worker_onStart(serv);
+    swTaskWorker_signal_init();
+    swServer_worker_onStart(serv);
 
-	char *tmp_dir = swoole_dirname(SW_TASK_TMP_FILE);
-	//create tmp dir
-	if (access(tmp_dir, R_OK) < 0 && swoole_mkdir_recursive(tmp_dir) < 0)
-	{
-		swWarn("create task tmp dir failed.");
-	}
-	free(tmp_dir);
+    char *tmp_dir = swoole_dirname(SwooleG.task_tmpdir);
+    //create tmp dir
+    if (access(tmp_dir, R_OK) < 0 && swoole_mkdir_recursive(tmp_dir) < 0)
+    {
+        swWarn("create task tmp dir failed.");
+    }
+    free(tmp_dir);
 }
 
 void swTaskWorker_onWorkerStop(swProcessPool *pool, int worker_id)

src/os/sendfile.c

@@ -73,7 +73,7 @@ int swoole_sendfile(int out_fd, int in_fd, off_t *offset, size_t size)
 #elif !defined(HAVE_SENDFILE)
 int swoole_sendfile(int out_fd, int in_fd, off_t *offset, size_t size)
 {
-	swWarn("no sendfile");
+	swWarn("no have sendfile");
 	return SW_ERR;
 }
 #endif

swoole.c

@@ -940,7 +940,21 @@ PHP_FUNCTION(swoole_server_set)
 		convert_to_long(*v);
 		SwooleG.task_ipc_mode = (int)Z_LVAL_PP(v);
 	}
-	//max_conn
+	/**
+	 * Temporary file directory for task_worker
+	 */
+    if (zend_hash_find(vht, ZEND_STRS("task_tmpdir"), (void **) &v) == SUCCESS)
+    {
+        convert_to_string(*v);
+        SwooleG.task_tmpdir = emalloc(SW_DIR_MAXLEN);
+        SwooleG.task_tmpdir_len = snprintf(SwooleG.task_tmpdir, SW_DIR_MAXLEN, "%s/task.XXXXXX", Z_STRVAL_PP(v)) + 1;
+    }
+    else
+    {
+        SwooleG.task_tmpdir = strndup(SW_TASK_TMP_FILE, sizeof(SW_TASK_TMP_FILE));
+        SwooleG.task_tmpdir_len = sizeof(SW_TASK_TMP_FILE);
+    }
+	//max_connection
 	if (zend_hash_find(vht, ZEND_STRS("max_connection"), (void **)&v) == SUCCESS ||
 	        zend_hash_find(vht, ZEND_STRS("max_conn"), (void **)&v) == SUCCESS)
 	{
@@ -1800,7 +1814,7 @@ static int php_swoole_onTask(swServer *serv, swEventData *req)
 	if (swTaskWorker_is_large(req))
 	{
 		int data_len;
-		void *buf;
+		char *buf;
 		swTaskWorker_large_unpack(req, emalloc, buf, data_len);
 
 		/**
@@ -1868,7 +1882,7 @@ static int php_swoole_onFinish(swServer *serv, swEventData *req)
 	if (swTaskWorker_is_large(req))
 	{
 		int data_len;
-		void *buf;
+		char *buf;
 		swTaskWorker_large_unpack(req, emalloc, buf, data_len);
 
 		/**
@@ -2927,7 +2941,7 @@ PHP_FUNCTION(swoole_server_taskwait)
 			if (swTaskWorker_is_large(task_result))
 			{
 				int data_len;
-				void *buf;
+				char *buf;
 				swTaskWorker_large_unpack(task_result, emalloc, buf, data_len);
 				/**
 				 * unpack failed
@@ -2937,7 +2951,7 @@ PHP_FUNCTION(swoole_server_taskwait)
 					efree(buf);
 					RETURN_FALSE;
 				}
-				RETURN_STRINGL(buf, data_len, 0);
+                RETURN_STRINGL(buf, data_len, 0);
 			}
 			else
 			{

swoole_config.h

@@ -137,6 +137,8 @@
 #define SW_USE_EVENTFD                   //是否使用eventfd来做消息通知，需要Linux 2.6.22以上版本才会支持
 
 #define SW_TASK_TMP_FILE                 "/tmp/swoole/task.XXXXXX"
+
+#define SW_DIR_MAXLEN                    128
 #define SW_FILE_CHUNK_SIZE               65536
 
 #define SW_TABLE_CONFLICT_PROPORTION     0.2 //20%