X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Futils_vl_lookup.h;h=e46e7637780ad72f75c59bb8b82bc9c045517066;hb=9d9678b9e753ea0936612021f4f87f8092ab4e31;hp=c006fc7ff681ea88faed0b263f1b2a375bf34392;hpb=7d5c193fce64d04cee72619c0b54d624d5011e35;p=collectd.git

diff --git a/src/utils_vl_lookup.h b/src/utils_vl_lookup.h
index c006fc7f..e46e7637 100644
--- a/src/utils_vl_lookup.h
+++ b/src/utils_vl_lookup.h
@@ -1,6 +1,6 @@
 /**
  * collectd - src/utils_vl_lookup.h
- * Copyright (C) 2012  Florian Forster
+ * Copyright (C) 2012       Florian Forster
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -53,7 +53,7 @@ typedef void (*lookup_free_class_callback_t) (void *user_class);
  * freed. */
 typedef void (*lookup_free_obj_callback_t) (void *user_obj);
 
-struct identifier_s
+struct lookup_identifier_s
 {
   char host[DATA_MAX_NAME_LEN];
   char plugin[DATA_MAX_NAME_LEN];
@@ -61,14 +61,13 @@ struct identifier_s
   char type[DATA_MAX_NAME_LEN];
   char type_instance[DATA_MAX_NAME_LEN];
 };
-typedef struct identifier_s identifier_t;
+typedef struct lookup_identifier_s lookup_identifier_t;
 
-#define LU_ANY "/any/"
-#define LU_ALL "/all/"
-
-#define LU_IS_ANY(str) (strcmp (str, LU_ANY) == 0)
-#define LU_IS_ALL(str) (strcmp (str, LU_ALL) == 0)
-#define LU_IS_WILDCARD(str) (LU_IS_ANY(str) || LU_IS_ALL(str))
+#define LU_GROUP_BY_HOST            0x01
+#define LU_GROUP_BY_PLUGIN          0x02
+#define LU_GROUP_BY_PLUGIN_INSTANCE 0x04
+/* #define LU_GROUP_BY_TYPE            0x00 */
+#define LU_GROUP_BY_TYPE_INSTANCE   0x10
 
 /*
  * Functions
@@ -81,7 +80,7 @@ lookup_t *lookup_create (lookup_class_callback_t,
 void lookup_destroy (lookup_t *obj);
 
 int lookup_add (lookup_t *obj,
-    identifier_t const *ident, void *user_class);
+    lookup_identifier_t const *ident, unsigned int group_by, void *user_class);
 
 /* TODO(octo): Pass lookup_obj_callback_t to lookup_search()? */
 int lookup_search (lookup_t *obj,