X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=contrib%2Fexamples%2Fmyplugin.c;h=9539062c9383b88ace7e06954ec60e6bb9fa6684;hb=03223b683c5c7340550028bf445e144004d1f24d;hp=cdd537a755327e94959a2808750f665a84d1bdc8;hpb=c192de2c944bf9c73903b4a6ac8379db3acc5955;p=collectd.git

diff --git a/contrib/examples/myplugin.c b/contrib/examples/myplugin.c
index cdd537a7..9539062c 100644
--- a/contrib/examples/myplugin.c
+++ b/contrib/examples/myplugin.c
@@ -59,6 +59,12 @@ static data_source_t dsrc[1] =
  * - name of the data set
  * - number of data sources
  * - list of data sources
+ *
+ * NOTE: If you're defining a custom data-set, you have to make that known to
+ * any servers as well. Else, the server is not able to store values using the
+ * type defined by that data-set.
+ * It is strongly recommended to use one of the types and data-sets
+ * pre-defined in the types.db file.
  */
 static data_set_t ds =
 {
@@ -92,15 +98,18 @@ static int my_read (void)
 	vl.values     = values;
 	vl.values_len = 1;
 	vl.time       = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "myplugin");
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "myplugin", sizeof (vl.plugin));
+
+	/* it is strongly recommended to use a type defined in the types.db file
+	 * instead of a custom type */
+	sstrncpy (vl.type, "myplugin", sizeof (vl.plugin));
 	/* optionally set vl.plugin_instance and vl.type_instance to reasonable
 	 * values (default: "") */
 
 	/* dispatch the values to collectd which passes them on to all registered
-	 * write functions - the first argument is used to lookup the data set
-	 * definition */
-	plugin_dispatch_values ("myplugin", &vl);
+	 * write functions */
+	plugin_dispatch_values (&vl);
 
 	/* A return value != 0 indicates an error and the plugin will be skipped
 	 * for an increasing amount of time. */
@@ -110,7 +119,8 @@ static int my_read (void)
 /*
  * This function is called after values have been dispatched to collectd.
  */
-static int my_write (const data_set_t *ds, const value_list_t *vl)
+static int my_write (const data_set_t *ds, const value_list_t *vl,
+		user_data_t *ud)
 {
 	char name[1024] = "";
 	int i = 0;
@@ -144,7 +154,7 @@ static int my_write (const data_set_t *ds, const value_list_t *vl)
 /*
  * This function is called when plugin_log () has been used.
  */
-static void my_log (int severity, const char *msg)
+static void my_log (int severity, const char *msg, user_data_t *ud)
 {
 	printf ("LOG: %i - %s\n", severity, msg);
 	return;
@@ -153,7 +163,7 @@ static void my_log (int severity, const char *msg)
 /*
  * This function is called when plugin_dispatch_notification () has been used.
  */
-static int my_notify (const notification_t *notif)
+static int my_notify (const notification_t *notif, user_data_t *ud)
 {
 	char time_str[32] = "";
 	struct tm *tm = NULL;
@@ -203,12 +213,13 @@ static int my_shutdown (void)
  */
 void module_register (void)
 {
-	plugin_register_log ("myplugin", my_log);
-	plugin_register_notification ("myplugin", my_notify);
+	plugin_register_log ("myplugin", my_log, /* user data */ NULL);
+	plugin_register_notification ("myplugin", my_notify,
+			/* user data */ NULL);
 	plugin_register_data_set (&ds);
 	plugin_register_read ("myplugin", my_read);
 	plugin_register_init ("myplugin", my_init);
-	plugin_register_write ("myplugin", my_write);
+	plugin_register_write ("myplugin", my_write, /* user data */ NULL);
 	plugin_register_shutdown ("myplugin", my_shutdown);
     return;
 } /* void module_register (void) */