2009-05-06 Zoltan Varga <vargaz@gmail.com>

	* debug-helpers.c (mono_method_desc_match): Add support for generic
	glob patterns.

svn path=/trunk/mono/; revision=133663

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 9d733a139841bc057a9947c4376d71328303f238..1a5737da2de6c4245ee8c2886d602f8451348aaa 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-06  Zoltan Varga  <vargaz@gmail.com>
+
+       * debug-helpers.c (mono_method_desc_match): Add support for generic
+       glob patterns.
+
 2009-05-05 Rodrigo Kumpera  <rkumpera@novell.com>
 
        * metadata-verify.c: Verify the propertymap table.

diff --git a/mono/metadata/debug-helpers.c b/mono/metadata/debug-helpers.c
index 1fbceeb9d170d8f90cbb3fe3f49ab352559213cd..27c4d2664eefa69483f0bc6e2838c3aa4f75bbee 100644 (file)
--- a/mono/metadata/debug-helpers.c
+++ b/mono/metadata/debug-helpers.c
@@ -23,7 +23,7 @@ struct MonoMethodDesc {
        char *name;
        char *args;
        guint num_args;
-       gboolean include_namespace;
+       gboolean include_namespace, klass_glob, name_glob;
 };
 
 #ifdef HAVE_ARRAY_ELEM_INIT
@@ -266,7 +266,7 @@ mono_context_get_desc (MonoGenericContext *context)
  *
  * in all the loaded assemblies.
  *
- * Both classname and methodname can be '*' which matches anything.
+ * Both classname and methodname can contain '*' which matches anything.
  *
  * Returns: a parsed representation of the method description.
  */
@@ -311,6 +311,10 @@ mono_method_desc_new (const char *name, gboolean include_namespace)
        result->klass = class_name;
        result->namespace = use_namespace? class_nspace: NULL;
        result->args = use_args? use_args: NULL;
+       if (strstr (result->name, "*"))
+               result->name_glob = TRUE;
+       if (strstr (result->klass, "*"))
+               result->klass_glob = TRUE;
        if (use_args) {
                end = use_args;
                if (*end)
@@ -362,7 +366,14 @@ gboolean
 mono_method_desc_match (MonoMethodDesc *desc, MonoMethod *method)
 {
        char *sig;
-       if (strcmp (desc->name, method->name) && (strcmp (desc->name, "*") != 0))
+       gboolean name_match;
+
+       name_match = strcmp (desc->name, method->name) == 0;
+#ifndef _EGLIB_MAJOR
+       if (!name_match && desc->name_glob)
+               name_match = g_pattern_match_simple (desc->name, method->name);
+#endif
+       if (!name_match)
                return FALSE;
        if (!desc->args)
                return TRUE;
@@ -398,8 +409,12 @@ match_class (MonoMethodDesc *desc, int pos, MonoClass *klass)
 {
        const char *p;
 
-       if (!strcmp (desc->klass, "*"))
+       if (desc->klass_glob && !strcmp (desc->klass, "*"))
                return TRUE;
+#ifndef _EGLIB_MAJOR
+       if (desc->klass_glob && g_pattern_match_simple (desc->klass, klass->name))
+               return TRUE;
+#endif
        p = my_strrchr (desc->klass, '/', &pos);
        if (!p) {
                if (strncmp (desc->klass, klass->name, pos))