rebase

taskvine/src/manager/vine_manager.c

@@ -3307,6 +3307,7 @@ struct vine_manager *vine_ssl_create(int port, const char *key, const char *cert
 
 	q->file_source_max_transfers = VINE_FILE_SOURCE_MAX_TRANSFERS;
 	q->worker_source_max_transfers = VINE_WORKER_SOURCE_MAX_TRANSFERS;
+	q->perf_log_interval = VINE_PERF_LOG_INTERVAL;
 
 	q->resource_submit_multiplier = 1.0;
 
@@ -4730,6 +4731,9 @@ int vine_tune(struct vine_manager *q, const char *name, double value)
 	} else if(!strcmp(name, "worker-source-max-transfers")){
 		q->worker_source_max_transfers = MAX(1, (int)value);
 
+	} else if(!strcmp(name, "perf-log-interval")){
+		q->perf_log_interval = MAX(1, (int)value);
+
 	} else if(!strcmp(name, "monitor-interval")) {
 		/* 0 means use monitor's default */
 		q->monitor_interval = MAX(0, (int)value);

taskvine/src/manager/vine_manager.h

@@ -150,6 +150,7 @@ struct vine_manager {
 	FILE *perf_logfile;        /* Performance logfile for tracking metrics by time. */
 	FILE *txn_logfile;         /* Transaction logfile for recording every event of interest. */
 	FILE *graph_logfile;       /* Graph logfile for visualizing application structure. */
+	int perf_log_interval;	   /* Minimum interval for performance log entries in seconds. */
 
 	/* Resource monitoring configuration. */
 

taskvine/src/manager/vine_perf_log.c

@@ -6,6 +6,7 @@ See the file COPYING for details.
 
 #include "vine_manager.h"
 
+#include "vine_perf_log.h"
 #include "timestamp.h"
 #include "buffer.h"
 #include "debug.h"
@@ -52,7 +53,7 @@ void vine_perf_log_write_update( struct vine_manager *q, int force )
 	struct vine_stats s;
 
 	timestamp_t now = timestamp_get();
-	if(!force && (now - q->time_last_log_stats < (ONE_SECOND*5))) {
+	if(!force && (now - q->time_last_log_stats < (ONE_SECOND*VINE_PERF_LOG_INTERVAL))) {
 		return;
 	}
 

taskvine/src/manager/vine_perf_log.h

@@ -15,6 +15,8 @@ This module is private to the manager and should not be invoked by the end user.
 
 #include "vine_manager.h"
 
+#define VINE_PERF_LOG_INTERVAL 5
+
 void vine_perf_log_write_header( struct vine_manager *q );
 void vine_perf_log_write_update( struct vine_manager *q, int force );