X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmysql.c;h=a2394137532d8fe54560eb1bc69a30d99b6357d5;hb=354f9991530248e45207d236eb74c1cc3d5238ef;hp=286fe49e789ca6df539ff6c15f2b06a492824bde;hpb=ff7918c602db4288b4ce061abf141e5a421b5b5d;p=collectd.git

diff --git a/src/mysql.c b/src/mysql.c
index 286fe49e..a2394137 100644
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -65,9 +65,6 @@ typedef struct mysql_database_s mysql_database_t; /* }}} */
 
 static int mysql_read (user_data_t *ud);
 
-void mysql_read_default_options(struct st_mysql_options *options,
-		const char *filename, const char *group);
-
 static void mysql_database_free (void *arg) /* {{{ */
 {
 	mysql_database_t *db;
@@ -116,13 +113,12 @@ static int mysql_config_database (oconfig_item_t *ci) /* {{{ */
 		return (-1);
 	}
 
-	db = (mysql_database_t *) malloc (sizeof (*db));
+	db = calloc (1, sizeof (*db));
 	if (db == NULL)
 	{
-		ERROR ("mysql plugin: malloc failed.");
+		ERROR ("mysql plugin: calloc failed.");
 		return (-1);
 	}
-	memset (db, 0, sizeof (*db));
 
 	/* initialize all the pointers */
 	db->alias    = NULL;
@@ -573,83 +569,83 @@ static int mysql_read_innodb_stats (mysql_database_t *db, MYSQL *con)
 	MYSQL_ROW  row;
 
 	const char *query;
-    struct {
-        const char *key;
-        const char *type;
-        int ds_type;
-    } metrics[] = {
-        { "metadata_mem_pool_size",         "bytes",        DS_TYPE_GAUGE },
-        { "lock_deadlocks",                 "mysql_locks",  DS_TYPE_DERIVE },
-        { "lock_timeouts",                  "mysql_locks",  DS_TYPE_DERIVE },
-        { "lock_row_lock_current_waits",    "mysql_locks",  DS_TYPE_DERIVE },
-        { "buffer_pool_size",               "bytes",        DS_TYPE_GAUGE },
-
-        { "buffer_pool_reads",              "operations",   DS_TYPE_DERIVE },
-        { "buffer_pool_read_requests",      "operations",   DS_TYPE_DERIVE },
-        { "buffer_pool_write_requests",     "operations",   DS_TYPE_DERIVE },
-        { "buffer_pool_wait_free",          "operations",   DS_TYPE_DERIVE },
-        { "buffer_pool_read_ahead",         "operations",   DS_TYPE_DERIVE },
-        { "buffer_pool_read_ahead_evicted", "operations",   DS_TYPE_DERIVE },
-
-        { "buffer_pool_pages_total",        "gauge",        DS_TYPE_GAUGE },
-        { "buffer_pool_pages_misc",         "gauge",        DS_TYPE_GAUGE },
-        { "buffer_pool_pages_data",         "gauge",        DS_TYPE_GAUGE },
-        { "buffer_pool_bytes_data",         "gauge",        DS_TYPE_GAUGE },
-        { "buffer_pool_pages_dirty",        "gauge",        DS_TYPE_GAUGE },
-        { "buffer_pool_bytes_dirty",        "gauge",        DS_TYPE_GAUGE },
-        { "buffer_pool_pages_free",         "gauge",        DS_TYPE_GAUGE },
-
-        { "buffer_pages_created",           "operations",   DS_TYPE_DERIVE },
-        { "buffer_pages_written",           "operations",   DS_TYPE_DERIVE },
-        { "buffer_pages_read",              "operations",   DS_TYPE_DERIVE },
-        { "buffer_data_reads",              "operations",   DS_TYPE_DERIVE },
-        { "buffer_data_written",            "operations",   DS_TYPE_DERIVE },
-
-        { "os_data_reads",                  "operations",   DS_TYPE_DERIVE },
-        { "os_data_writes",                 "operations",   DS_TYPE_DERIVE },
-        { "os_data_fsyncs",                 "operations",   DS_TYPE_DERIVE },
-        { "os_log_bytes_written",           "operations",   DS_TYPE_DERIVE },
-        { "os_log_fsyncs",                  "operations",   DS_TYPE_DERIVE },
-        { "os_log_pending_fsyncs",          "operations",   DS_TYPE_DERIVE },
-        { "os_log_pending_writes",          "operations",   DS_TYPE_DERIVE },
-
-        { "trx_rseg_history_len",           "gauge",        DS_TYPE_GAUGE },
-
-        { "log_waits",                      "operations",   DS_TYPE_DERIVE },
-        { "log_write_requests",             "operations",   DS_TYPE_DERIVE },
-        { "log_writes",                     "operations",   DS_TYPE_DERIVE },
-        { "adaptive_hash_searches",         "operations",   DS_TYPE_DERIVE },
-
-        { "file_num_open_files",            "gauge",        DS_TYPE_GAUGE },
-
-        { "ibuf_merges_insert",             "operations",   DS_TYPE_DERIVE },
-        { "ibuf_merges_delete_mark",        "operations",   DS_TYPE_DERIVE },
-        { "ibuf_merges_delete",             "operations",   DS_TYPE_DERIVE },
-        { "ibuf_merges_discard_insert",     "operations",   DS_TYPE_DERIVE },
-        { "ibuf_merges_discard_delete_mark","operations",   DS_TYPE_DERIVE },
-        { "ibuf_merges_discard_delete",     "operations",   DS_TYPE_DERIVE },
-        { "ibuf_merges_discard_merges",     "operations",   DS_TYPE_DERIVE },
-        { "ibuf_size",                      "bytes",        DS_TYPE_GAUGE },
-
-        { "innodb_activity_count",          "gauge",        DS_TYPE_GAUGE },
-        { "innodb_dblwr_writes",            "operations",   DS_TYPE_DERIVE },
-        { "innodb_dblwr_pages_written",     "operations",   DS_TYPE_DERIVE },
-        { "innodb_dblwr_page_size",         "gauge",        DS_TYPE_GAUGE },
-
-        { "innodb_rwlock_s_spin_waits",     "operations",   DS_TYPE_DERIVE },
-        { "innodb_rwlock_x_spin_waits",     "operations",   DS_TYPE_DERIVE },
-        { "innodb_rwlock_s_spin_rounds",    "operations",   DS_TYPE_DERIVE },
-        { "innodb_rwlock_x_spin_rounds",    "operations",   DS_TYPE_DERIVE },
-        { "innodb_rwlock_s_os_waits",       "operations",   DS_TYPE_DERIVE },
-        { "innodb_rwlock_x_os_waits",       "operations",   DS_TYPE_DERIVE },
-
-        { "dml_reads",                      "operations",   DS_TYPE_DERIVE },
-        { "dml_inserts",                    "operations",   DS_TYPE_DERIVE },
-        { "dml_deletes",                    "operations",   DS_TYPE_DERIVE },
-        { "dml_updates",                    "operations",   DS_TYPE_DERIVE },
-
-        { NULL,                     NULL,           0}
-    };
+	struct {
+		const char *key;
+		const char *type;
+		int ds_type;
+	} metrics[] = {
+		{ "metadata_mem_pool_size",          "bytes",        DS_TYPE_GAUGE },
+		{ "lock_deadlocks",                  "mysql_locks",  DS_TYPE_DERIVE },
+		{ "lock_timeouts",                   "mysql_locks",  DS_TYPE_DERIVE },
+		{ "lock_row_lock_current_waits",     "mysql_locks",  DS_TYPE_DERIVE },
+		{ "buffer_pool_size",                "bytes",        DS_TYPE_GAUGE },
+
+		{ "buffer_pool_reads",               "operations",   DS_TYPE_DERIVE },
+		{ "buffer_pool_read_requests",       "operations",   DS_TYPE_DERIVE },
+		{ "buffer_pool_write_requests",      "operations",   DS_TYPE_DERIVE },
+		{ "buffer_pool_wait_free",           "operations",   DS_TYPE_DERIVE },
+		{ "buffer_pool_read_ahead",          "operations",   DS_TYPE_DERIVE },
+		{ "buffer_pool_read_ahead_evicted",  "operations",   DS_TYPE_DERIVE },
+
+		{ "buffer_pool_pages_total",         "gauge",        DS_TYPE_GAUGE },
+		{ "buffer_pool_pages_misc",          "gauge",        DS_TYPE_GAUGE },
+		{ "buffer_pool_pages_data",          "gauge",        DS_TYPE_GAUGE },
+		{ "buffer_pool_bytes_data",          "gauge",        DS_TYPE_GAUGE },
+		{ "buffer_pool_pages_dirty",         "gauge",        DS_TYPE_GAUGE },
+		{ "buffer_pool_bytes_dirty",         "gauge",        DS_TYPE_GAUGE },
+		{ "buffer_pool_pages_free",          "gauge",        DS_TYPE_GAUGE },
+
+		{ "buffer_pages_created",            "operations",   DS_TYPE_DERIVE },
+		{ "buffer_pages_written",            "operations",   DS_TYPE_DERIVE },
+		{ "buffer_pages_read",               "operations",   DS_TYPE_DERIVE },
+		{ "buffer_data_reads",               "operations",   DS_TYPE_DERIVE },
+		{ "buffer_data_written",             "operations",   DS_TYPE_DERIVE },
+
+		{ "os_data_reads",                   "operations",   DS_TYPE_DERIVE },
+		{ "os_data_writes",                  "operations",   DS_TYPE_DERIVE },
+		{ "os_data_fsyncs",                  "operations",   DS_TYPE_DERIVE },
+		{ "os_log_bytes_written",            "operations",   DS_TYPE_DERIVE },
+		{ "os_log_fsyncs",                   "operations",   DS_TYPE_DERIVE },
+		{ "os_log_pending_fsyncs",           "operations",   DS_TYPE_DERIVE },
+		{ "os_log_pending_writes",           "operations",   DS_TYPE_DERIVE },
+
+		{ "trx_rseg_history_len",            "gauge",        DS_TYPE_GAUGE },
+
+		{ "log_waits",                       "operations",   DS_TYPE_DERIVE },
+		{ "log_write_requests",              "operations",   DS_TYPE_DERIVE },
+		{ "log_writes",                      "operations",   DS_TYPE_DERIVE },
+		{ "adaptive_hash_searches",          "operations",   DS_TYPE_DERIVE },
+
+		{ "file_num_open_files",             "gauge",        DS_TYPE_GAUGE },
+
+		{ "ibuf_merges_insert",              "operations",   DS_TYPE_DERIVE },
+		{ "ibuf_merges_delete_mark",         "operations",   DS_TYPE_DERIVE },
+		{ "ibuf_merges_delete",              "operations",   DS_TYPE_DERIVE },
+		{ "ibuf_merges_discard_insert",      "operations",   DS_TYPE_DERIVE },
+		{ "ibuf_merges_discard_delete_mark", "operations",   DS_TYPE_DERIVE },
+		{ "ibuf_merges_discard_delete",      "operations",   DS_TYPE_DERIVE },
+		{ "ibuf_merges_discard_merges",      "operations",   DS_TYPE_DERIVE },
+		{ "ibuf_size",                       "bytes",        DS_TYPE_GAUGE },
+
+		{ "innodb_activity_count",           "gauge",        DS_TYPE_GAUGE },
+		{ "innodb_dblwr_writes",             "operations",   DS_TYPE_DERIVE },
+		{ "innodb_dblwr_pages_written",      "operations",   DS_TYPE_DERIVE },
+		{ "innodb_dblwr_page_size",          "gauge",        DS_TYPE_GAUGE },
+
+		{ "innodb_rwlock_s_spin_waits",      "operations",   DS_TYPE_DERIVE },
+		{ "innodb_rwlock_x_spin_waits",      "operations",   DS_TYPE_DERIVE },
+		{ "innodb_rwlock_s_spin_rounds",     "operations",   DS_TYPE_DERIVE },
+		{ "innodb_rwlock_x_spin_rounds",     "operations",   DS_TYPE_DERIVE },
+		{ "innodb_rwlock_s_os_waits",        "operations",   DS_TYPE_DERIVE },
+		{ "innodb_rwlock_x_os_waits",        "operations",   DS_TYPE_DERIVE },
+
+		{ "dml_reads",                       "operations",   DS_TYPE_DERIVE },
+		{ "dml_inserts",                     "operations",   DS_TYPE_DERIVE },
+		{ "dml_deletes",                     "operations",   DS_TYPE_DERIVE },
+		{ "dml_updates",                     "operations",   DS_TYPE_DERIVE },
+
+		{ NULL,                              NULL,           0}
+	};
 
 	query = "SELECT name, count, type FROM information_schema.innodb_metrics WHERE status = 'enabled'";
 
@@ -659,36 +655,34 @@ static int mysql_read_innodb_stats (mysql_database_t *db, MYSQL *con)
 
 	while ((row = mysql_fetch_row (res)))
 	{
-        int i;
+		int i;
 		char *key;
 		unsigned long long val;
 
 		key = row[0];
 		val = atoll (row[1]);
 
-        for (i = 0;
-             metrics[i].key != NULL && strcmp(metrics[i].key, key) != 0;
-             i++)
-            ;
-
-        if (metrics[i].key == NULL)
-            continue;
-
-        switch (metrics[i].ds_type) {
-        case DS_TYPE_COUNTER:
-            counter_submit(metrics[i].type, key, (counter_t)val, db);
-            break;
-        case DS_TYPE_GAUGE:
-            gauge_submit(metrics[i].type, key, (gauge_t)val, db);
-            break;
-        case DS_TYPE_DERIVE:
-            derive_submit(metrics[i].type, key, (derive_t)val, db);
-            break;
-        }
-    }
-
-    mysql_free_result(res);
-    return (0);
+		for (i = 0; metrics[i].key != NULL && strcmp(metrics[i].key, key) != 0; i++)
+			;
+
+		if (metrics[i].key == NULL)
+			continue;
+
+		switch (metrics[i].ds_type) {
+			case DS_TYPE_COUNTER:
+				counter_submit(metrics[i].type, key, (counter_t)val, db);
+				break;
+			case DS_TYPE_GAUGE:
+				gauge_submit(metrics[i].type, key, (gauge_t)val, db);
+				break;
+			case DS_TYPE_DERIVE:
+				derive_submit(metrics[i].type, key, (derive_t)val, db);
+				break;
+		}
+	}
+
+	mysql_free_result(res);
+	return (0);
 }
 
 static int mysql_read (user_data_t *ud)
@@ -712,7 +706,7 @@ static int mysql_read (user_data_t *ud)
 
 	unsigned long long traffic_incoming = 0ULL;
 	unsigned long long traffic_outgoing = 0ULL;
-    unsigned long mysql_version = 0ULL;
+	unsigned long mysql_version = 0ULL;
 
 	if ((ud == NULL) || (ud->data == NULL))
 	{
@@ -726,7 +720,7 @@ static int mysql_read (user_data_t *ud)
 	if ((con = getconnection (db)) == NULL)
 		return (-1);
 
-  mysql_version = mysql_get_server_version(con);
+	mysql_version = mysql_get_server_version(con);
 
 	query = "SHOW STATUS";
 	if (mysql_version >= 50002)
@@ -744,7 +738,7 @@ static int mysql_read (user_data_t *ud)
 		key = row[0];
 		val = atoll (row[1]);
 
-		if (strncmp (key, "Com_", 
+		if (strncmp (key, "Com_",
 			          strlen ("Com_")) == 0)
 		{
 			if (val == 0ULL)
@@ -752,18 +746,18 @@ static int mysql_read (user_data_t *ud)
 
 			/* Ignore `prepared statements' */
 			if (strncmp (key, "Com_stmt_", strlen ("Com_stmt_")) != 0)
-				counter_submit ("mysql_commands", 
-						key + strlen ("Com_"), 
+				counter_submit ("mysql_commands",
+						key + strlen ("Com_"),
 						val, db);
 		}
-		else if (strncmp (key, "Handler_", 
+		else if (strncmp (key, "Handler_",
 				        strlen ("Handler_")) == 0)
 		{
 			if (val == 0ULL)
 				continue;
 
-			counter_submit ("mysql_handler", 
-					key + strlen ("Handler_"), 
+			counter_submit ("mysql_handler",
+					key + strlen ("Handler_"),
 					val, db);
 		}
 		else if (strncmp (key, "Qcache_",
@@ -780,7 +774,7 @@ static int mysql_read (user_data_t *ud)
 			else if (strcmp (key, "Qcache_queries_in_cache") == 0)
 				qcache_queries_in_cache = (gauge_t) val;
 		}
-		else if (strncmp (key, "Bytes_", 
+		else if (strncmp (key, "Bytes_",
 				        strlen ("Bytes_")) == 0)
 		{
 			if (strcmp (key, "Bytes_received") == 0)
@@ -788,7 +782,7 @@ static int mysql_read (user_data_t *ud)
 			else if (strcmp (key, "Bytes_sent") == 0)
 				traffic_outgoing += val;
 		}
-		else if (strncmp (key, "Threads_", 
+		else if (strncmp (key, "Threads_",
        				        strlen ("Threads_")) == 0)
 		{
 			if (strcmp (key, "Threads_running") == 0)
@@ -900,8 +894,15 @@ static int mysql_read (user_data_t *ud)
 		}
 		else if (strncmp (key, "Sort_", strlen ("Sort_")) == 0)
 		{
-			counter_submit ("mysql_sort", key + strlen ("Sort_"),
-					val, db);
+			if (strcmp (key, "Sort_merge_passes") == 0)
+				counter_submit ("mysql_sort_merge_passes", NULL, val, db);
+			else if (strcmp (key, "Sort_rows") == 0)
+				counter_submit ("mysql_sort_rows", NULL, val, db);
+			else if (strcmp (key, "Sort_range") == 0)
+				counter_submit ("mysql_sort", "range", val, db);
+			else if (strcmp (key, "Sort_scan") == 0)
+				counter_submit ("mysql_sort", "scan", val, db);
+
 		}
 	}
 	mysql_free_result (res); res = NULL;
@@ -940,7 +941,7 @@ static int mysql_read (user_data_t *ud)
 	traffic_submit  (traffic_incoming, traffic_outgoing, db);
 
 	if (mysql_version >= 50600 && db->innodb_stats)
-        mysql_read_innodb_stats (db, con);
+		mysql_read_innodb_stats (db, con);
 
 	if (db->master_stats)
 		mysql_read_master_stats (db, con);