From: Timo Sirainen <tss@iki.fi>
Date: Wed, 16 Sep 2015 22:24:28 +0000 (+0900)
Subject: cassandra: With debugging, log also how long result was used for before it was freed.
X-Git-Tag: 2.2.19.rc1~42
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2ccb478c35972517721ce415d81fcbd11a73fad3;p=thirdparty%2Fdovecot%2Fcore.git

cassandra: With debugging, log also how long result was used for before it was freed.
This includes the time spent on SELECT query's iterator.
---

diff --git a/src/lib-sql/driver-cassandra.c b/src/lib-sql/driver-cassandra.c
index 9a4d5d020e..d37b943a38 100644
--- a/src/lib-sql/driver-cassandra.c
+++ b/src/lib-sql/driver-cassandra.c
@@ -64,7 +64,7 @@ struct cassandra_result {
 	char *query;
 	char *error;
 	enum cassandra_query_type query_type;
-	struct timeval start_time;
+	struct timeval start_time, finish_time;
 
 	pool_t row_pool;
 	ARRAY_TYPE(const_string) fields;
@@ -457,6 +457,7 @@ static void driver_cassandra_result_free(struct sql_result *_result)
 {
 	struct cassandra_db *db = (struct cassandra_db *)_result->db;
         struct cassandra_result *result = (struct cassandra_result *)_result;
+	struct timeval now;
 
 	i_assert(!result->api.callback);
 	i_assert(result->callback == NULL);
@@ -464,6 +465,15 @@ static void driver_cassandra_result_free(struct sql_result *_result)
 	if (_result == db->sync_result)
 		db->sync_result = NULL;
 
+	if (db->log_level >= CASS_LOG_DEBUG) {
+		if (gettimeofday(&now, NULL) < 0)
+			i_fatal("gettimeofday() failed: %m");
+		i_debug("cassandra: Finished query '%s' (%lld+%lld us): %s", result->query,
+			timeval_diff_usecs(&result->finish_time, &result->start_time),
+			timeval_diff_usecs(&now, &result->finish_time),
+			result->error != NULL ? result->error : "success");
+	}
+
 	if (result->result != NULL)
 		cass_result_free(result->result);
 	if (result->iterator != NULL)
@@ -480,20 +490,12 @@ static void driver_cassandra_result_free(struct sql_result *_result)
 static void result_finish(struct cassandra_result *result)
 {
 	struct cassandra_db *db = (struct cassandra_db *)result->api.db;
-	struct timeval now;
 	bool free_result = TRUE;
 
 	result->finished = TRUE;
+	result->finish_time = ioloop_timeval;
 	driver_cassandra_result_unlink(db, result);
 
-	if (db->log_level >= CASS_LOG_DEBUG) {
-		if (gettimeofday(&now, NULL) < 0)
-			i_fatal("gettimeofday() failed: %m");
-		i_debug("cassandra: Finished query '%s' (%lld us): %s", result->query,
-			timeval_diff_usecs(&now, &result->start_time),
-			result->error != NULL ? result->error : "success");
-	}
-
 	i_assert((result->error != NULL) == (result->iterator == NULL));
 
 	result->api.callback = TRUE;