Commits March 2011

commits@lists.geany.org

4 participants
116 discussions

SF.net SVN: geany:[5567] trunk/src/symbols.c
by colombanw＠users.sourceforge.net 05 Mar '11

05 Mar '11

Revision: 5567 http://geany.svn.sourceforge.net/geany/?rev=5567&view=rev Author: colombanw Date: 2011-03-05 22:56:55 +0000 (Sat, 05 Mar 2011) Log Message: ----------- Improve performances of symbol list updating Rather than walking the whole tree for each tag to find a possibly corresponding row, use a hash table as cache. This is a very significant improvement on large files with many tags, reducing for example to about 170ms an update that took more than 18s before. Also fix merging of tags with same name and scope (probably unlikely to exist in real-world files, but the tagmanager extract them correctly and they used to display correctly too). Modified Paths: -------------- trunk/src/symbols.c Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2011-03-05 22:55:34 UTC (rev 5566) +++ trunk/src/symbols.c 2011-03-05 22:56:55 UTC (rev 5567) @@ -1161,31 +1161,90 @@ } -static gboolean find_iter(GtkTreeStore *store, GtkTreeIter *iter, const TMTag *tag) +static gboolean tag_equal(gconstpointer v1, gconstpointer v2) { + const TMTag *t1 = v1; + const TMTag *t2 = v2; + + return (t1->type == t2->type && strcmp(t1->name, t2->name) == 0 && + utils_str_equal(t1->atts.entry.scope, t2->atts.entry.scope)); +} + + +/* inspired from g_str_hash() */ +static guint tag_hash(gconstpointer v) +{ + const TMTag *tag = v; + const signed char *p; + guint32 h = 5381; + + h = (h << 5) + h + tag->type; + for (p = tag->name; *p != '\0'; p++) + h = (h << 5) + h + *p; + if (tag->atts.entry.scope) + { + for (p = tag->atts.entry.scope; *p != '\0'; p++) + h = (h << 5) + h + *p; + } + + return h; +} + + +static GHashTable *build_iter_table(GtkTreeStore *store) +{ GtkTreeModel *model = GTK_TREE_MODEL(store); - gboolean found = FALSE; + GHashTable *table; + GtkTreeIter iter; - if (!gtk_tree_model_get_iter_first(model, iter)) - return FALSE; + table = g_hash_table_new_full(tag_hash, tag_equal, + (GDestroyNotify)tm_tag_unref, (GDestroyNotify)gtk_tree_path_free); + + if (!gtk_tree_model_get_iter_first(model, &iter)) + return table; do { - TMTag *candidate; + TMTag *tag; - gtk_tree_model_get(model, iter, SYMBOLS_COLUMN_TAG, &candidate, -1); - found = (candidate && candidate->type == tag->type && - utils_str_equal(candidate->name, tag->name) && - utils_str_equal(candidate->atts.entry.scope, tag->atts.entry.scope)); - tm_tag_unref(candidate); + gtk_tree_model_get(model, &iter, SYMBOLS_COLUMN_TAG, &tag, -1); + if (tag) + g_hash_table_insert(table, tag, gtk_tree_model_get_path(model, &iter)); } - while (!found && next_iter(model, iter)); + while (next_iter(model, &iter)); - return found; + return table; } -static void add_tree_tag(GeanyDocument *doc, const TMTag *tag, GHashTable *parent_hash) +static gboolean find_iter(GtkTreeStore *store, GHashTable *iter_hash, const TMTag *tag, + GtkTreeIter *iter) { + GtkTreePath *path; + + path = g_hash_table_lookup(iter_hash, tag); + if (path) + { + GtkTreeIter tmp; + gboolean valid; + + if (!gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &tmp, path)) + return FALSE; + gtk_tree_model_get(GTK_TREE_MODEL(store), &tmp, SYMBOLS_COLUMN_VALID, &valid, -1); + /* if the row is valid it has already been updated, so it's simply a duplicate */ + if (!valid) + { + *iter = tmp; + return TRUE; + } + } + + return FALSE; +} + + +static void add_tree_tag(GeanyDocument *doc, const TMTag *tag, GHashTable *parent_hash, + GHashTable *iter_hash) +{ filetype_id ft_id = doc->file_type->id; GtkTreeStore *tree_store = doc->priv->tag_store; GtkTreeIter *parent = NULL; @@ -1226,7 +1285,7 @@ child = new_iter; } - if (!find_iter(tree_store, child, tag)) + if (!find_iter(tree_store, iter_hash, tag, child)) { gboolean expand = FALSE; @@ -1271,9 +1330,11 @@ { const GList *item; GHashTable *parent_hash; + GHashTable *iter_hash; /* Create a hash table "parent_tag_name":(GtkTreeIter*) */ parent_hash = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_free); + iter_hash = build_iter_table(doc->priv->tag_store); /* find and store all parent names in the hash table */ for (item = tags; item; item = g_list_next(item)) @@ -1288,8 +1349,9 @@ { const TMTag *tag = item->data; - add_tree_tag(doc, tag, parent_hash); + add_tree_tag(doc, tag, parent_hash, iter_hash); } + g_hash_table_destroy(iter_hash); g_hash_table_destroy(parent_hash); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5566] trunk/tagmanager/c.c
by colombanw＠users.sourceforge.net 05 Mar '11

05 Mar '11

Revision: 5566 http://geany.svn.sourceforge.net/geany/?rev=5566&view=rev Author: colombanw Date: 2011-03-05 22:55:34 +0000 (Sat, 05 Mar 2011) Log Message: ----------- Fix some indentation style errors Modified Paths: -------------- trunk/tagmanager/c.c Modified: trunk/tagmanager/c.c =================================================================== --- trunk/tagmanager/c.c 2011-03-05 22:55:00 UTC (rev 5565) +++ trunk/tagmanager/c.c 2011-03-05 22:55:34 UTC (rev 5566) @@ -661,7 +661,7 @@ static const char *accessString (const accessType laccess) { - static const char *const names [] ={ + static const char *const names [] = { "?", "private", "protected", "public", "default" }; Assert (sizeof (names) / sizeof (names [0]) == ACCESS_COUNT); @@ -671,7 +671,7 @@ static const char *implementationString (const impType imp) { - static const char *const names [] ={ + static const char *const names [] = { "?", "abstract", "virtual", "pure virtual" }; Assert (sizeof (names) / sizeof (names [0]) == IMP_COUNT); @@ -710,14 +710,14 @@ static const char *declString (const declType declaration) { - static const char *const names [] = { - "?", "base", "class", "enum", "event", "signal", "function", - "function template", "ignore", "interface", "module", "namespace", - "no mangle", "package", "struct", "union", - }; - Assert (sizeof (names) / sizeof (names [0]) == DECL_COUNT); - Assert ((int) declaration < DECL_COUNT); - return names[(int) declaration]; + static const char *const names [] = { + "?", "base", "class", "enum", "event", "signal", "function", + "function template", "ignore", "interface", "module", "namespace", + "no mangle", "package", "struct", "union", + }; + Assert (sizeof (names) / sizeof (names [0]) == DECL_COUNT); + Assert ((int) declaration < DECL_COUNT); + return names[(int) declaration]; } static const char *keywordString (const keywordId keyword) @@ -954,8 +954,7 @@ initToken (st->blockName); vStringClear (st->parentClasses); - /* Init member info. - */ + /* Init member info. */ if (! partial) st->member.access = st->member.accessDefault; @@ -982,7 +981,7 @@ st->parent = parent; initMemberInfo (st); reinitStatement (st, FALSE); - if(parent) + if (parent) { const tokenInfo *const src = activeToken (parent); tokenInfo *const dst = activeToken (st); @@ -1183,11 +1182,11 @@ static void addOtherFields (tagEntryInfo* const tag, const tagType type, const statementInfo *const st, vString *const scope) { - /* For selected tag types, append an extension flag designating the - * parent object in which the tag is defined. - */ - switch (type) - { + /* For selected tag types, append an extension flag designating the + * parent object in which the tag is defined. + */ + switch (type) + { default: break; case TAG_CLASS: @@ -1216,7 +1215,6 @@ if ((type == TAG_CLASS || type == TAG_INTERFACE || type == TAG_STRUCT) && vStringLength (st->parentClasses) > 0) { - tag->extensionFields.inheritance = vStringValue (st->parentClasses); } @@ -1548,7 +1546,8 @@ else if (st->scope == SCOPE_GLOBAL || st->scope == SCOPE_STATIC) makeTag (nameToken, st, TRUE, TAG_MEMBER); } - else if (isLanguage (Lang_java) || isLanguage (Lang_csharp) || isLanguage (Lang_vala)); + else if (isLanguage (Lang_java) || isLanguage (Lang_csharp) || isLanguage (Lang_vala)) + ; else { if (st->scope == SCOPE_EXTERN || ! st->haveQualifyingName) @@ -2469,10 +2468,8 @@ skipToMatch ("()"); --depth; } - if (st->argEndPosition == 0) - { - st->argEndPosition = mio_tell(File.mio); - } + if (st->argEndPosition == 0) + st->argEndPosition = mio_tell (File.mio); if (! info->isNameCandidate) initToken (token); @@ -2520,7 +2517,8 @@ token->type = TOKEN_NAME; processName (st); st->gotParenName = TRUE; - if (isLanguage(Lang_d) && c == '(' && isType (prev, TOKEN_NAME)) { + if (isLanguage(Lang_d) && c == '(' && isType (prev, TOKEN_NAME)) + { st->declaration = DECL_FUNCTION_TEMPLATE; copyToken (st->blockName, prev); } @@ -2855,12 +2853,12 @@ static void tagCheck (statementInfo *const st) { - const tokenInfo *const token = activeToken (st); - const tokenInfo *const prev = prevToken (st, 1); - const tokenInfo *const prev2 = prevToken (st, 2); + const tokenInfo *const token = activeToken (st); + const tokenInfo *const prev = prevToken (st, 1); + const tokenInfo *const prev2 = prevToken (st, 2); - switch (token->type) - { + switch (token->type) + { case TOKEN_NAME: { if (insideEnumBody (st)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5565] trunk/tagmanager/c.c
by colombanw＠users.sourceforge.net 05 Mar '11

05 Mar '11

Revision: 5565 http://geany.svn.sourceforge.net/geany/?rev=5565&view=rev Author: colombanw Date: 2011-03-05 22:55:00 +0000 (Sat, 05 Mar 2011) Log Message: ----------- Fix some debugging functions in C tag parser Modified Paths: -------------- trunk/tagmanager/c.c Modified: trunk/tagmanager/c.c =================================================================== --- trunk/tagmanager/c.c 2011-03-05 22:54:33 UTC (rev 5564) +++ trunk/tagmanager/c.c 2011-03-05 22:55:00 UTC (rev 5565) @@ -691,7 +691,7 @@ { static const char *const names [] = { "none", "args", "}", "{", "comma", "double colon", "keyword", "name", - "package", "paren-name", "semicolon", "specifier", "*", "[]", "count" + "package", "paren-name", "semicolon", "specifier", "*", "[]" }; Assert (sizeof (names) / sizeof (names [0]) == TOKEN_COUNT); Assert ((int) type < TOKEN_COUNT); @@ -711,8 +711,9 @@ static const char *declString (const declType declaration) { static const char *const names [] = { - "?", "base", "class", "enum", "function", "ignore", "interface", - "namespace", "no mangle", "package", "struct", "union", + "?", "base", "class", "enum", "event", "signal", "function", + "function template", "ignore", "interface", "module", "namespace", + "no mangle", "package", "struct", "union", }; Assert (sizeof (names) / sizeof (names [0]) == DECL_COUNT); Assert ((int) declaration < DECL_COUNT); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5564] trunk/tagmanager/c.c
by colombanw＠users.sourceforge.net 05 Mar '11

05 Mar '11

Revision: 5564 http://geany.svn.sourceforge.net/geany/?rev=5564&view=rev Author: colombanw Date: 2011-03-05 22:54:33 +0000 (Sat, 05 Mar 2011) Log Message: ----------- Plug a memory leak in the C tag parser Modified Paths: -------------- trunk/tagmanager/c.c Modified: trunk/tagmanager/c.c =================================================================== --- trunk/tagmanager/c.c 2011-03-05 22:53:58 UTC (rev 5563) +++ trunk/tagmanager/c.c 2011-03-05 22:54:33 UTC (rev 5564) @@ -2891,6 +2891,7 @@ else if (isContextualStatement (st)) { tokenInfo *name_token = (tokenInfo *)prev; + boolean free_name_token = FALSE; if (isType (name_token, TOKEN_NAME)) { @@ -2927,6 +2928,7 @@ char buffer[64]; name_token = newToken (); + free_name_token = TRUE; copyToken (name_token, contextual_token); sprintf(buffer, "anon_%s_%d", name_token->name->buffer, contextual_fake_count++); @@ -2945,6 +2947,8 @@ } } qualifyBlockTag (st, name_token); + if (free_name_token) + deleteToken (name_token); } break; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5563] trunk/tagmanager/c.c
by colombanw＠users.sourceforge.net 05 Mar '11

05 Mar '11

Revision: 5563 http://geany.svn.sourceforge.net/geany/?rev=5563&view=rev Author: colombanw Date: 2011-03-05 22:53:58 +0000 (Sat, 05 Mar 2011) Log Message: ----------- Fix suffix of anonymous symbols (structs, enums, ...) in the C parser Modified Paths: -------------- trunk/tagmanager/c.c Modified: trunk/tagmanager/c.c =================================================================== --- trunk/tagmanager/c.c 2011-03-05 22:53:13 UTC (rev 5562) +++ trunk/tagmanager/c.c 2011-03-05 22:53:58 UTC (rev 5563) @@ -3022,6 +3022,8 @@ exception_t exception; boolean retry; + contextual_fake_count = 0; + Assert (passCount < 3); cppInit ((boolean) (passCount > 1), isLanguage (Lang_csharp)); @@ -3060,56 +3062,48 @@ static void initializeCParser (const langType language) { - contextual_fake_count = 0; Lang_c = language; buildKeywordHash (language, 0); } static void initializeCppParser (const langType language) { - contextual_fake_count = 0; Lang_cpp = language; buildKeywordHash (language, 1); } static void initializeJavaParser (const langType language) { - contextual_fake_count = 0; Lang_java = language; buildKeywordHash (language, 3); } static void initializeDParser (const langType language) { - contextual_fake_count = 0; Lang_d = language; buildKeywordHash (language, 6); } static void initializeGLSLParser (const langType language) { - contextual_fake_count = 0; Lang_glsl = language; buildKeywordHash (language, 0); /* C keywords */ } static void initializeFeriteParser (const langType language) { - contextual_fake_count = 0; Lang_ferite = language; buildKeywordHash (language, 1); /* C++ keywords */ } static void initializeCsharpParser (const langType language) { - contextual_fake_count = 0; Lang_csharp = language; buildKeywordHash (language, 2); } static void initializeValaParser (const langType language) { - contextual_fake_count = 0; Lang_vala = language; buildKeywordHash (language, 5); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5562] trunk/src
by colombanw＠users.sourceforge.net 05 Mar '11

05 Mar '11

Revision: 5562 http://geany.svn.sourceforge.net/geany/?rev=5562&view=rev Author: colombanw Date: 2011-03-05 22:53:13 +0000 (Sat, 05 Mar 2011) Log Message: ----------- Update the symbol list rather than clearing and re-building it The main advantages of not clearing and rebuilding the whole list is that it doesn't loose the folding and selection (as far as the selected row(s) still exist after the update, of course), and it reduces flickering upon update. The current implementation works in 3-steps: 1) mark all rows as invalid; 2) insert/update the rows, according to the new tag list, marking them as valid; 3) remove all rows that are still invalid. This walks (rows) the first time, (tags*rows) the second and (rows) the third. This also uses an extra column to store the row's validity. A (probably) better implementation would be to: 1) walk the current rows, updating them if necessary, or removing them; 2) add the remaining tags that weren't there before. This is probably faster in theory (and probably also in practice), but it needs to refactor a lot the code to easily update *or* create a row, what the current code does not provide. Basically this is would be a two-pass update, walking (rows*tags) in the first pass, and only the remaining non-added tags in the second. Modified Paths: -------------- trunk/src/sidebar.c trunk/src/sidebar.h trunk/src/symbols.c Modified: trunk/src/sidebar.c =================================================================== --- trunk/src/sidebar.c 2011-03-05 22:51:32 UTC (rev 5561) +++ trunk/src/sidebar.c 2011-03-05 22:53:13 UTC (rev 5562) @@ -226,7 +226,7 @@ if (doc->priv->tag_tree == NULL) { doc->priv->tag_store = gtk_tree_store_new( - SYMBOLS_N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, TM_TYPE_TAG, G_TYPE_STRING); + SYMBOLS_N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, TM_TYPE_TAG, G_TYPE_STRING, G_TYPE_BOOLEAN); doc->priv->tag_tree = gtk_tree_view_new(); prepare_taglist(doc->priv->tag_tree, doc->priv->tag_store); gtk_widget_show(doc->priv->tag_tree); Modified: trunk/src/sidebar.h =================================================================== --- trunk/src/sidebar.h 2011-03-05 22:51:32 UTC (rev 5561) +++ trunk/src/sidebar.h 2011-03-05 22:53:13 UTC (rev 5562) @@ -43,6 +43,7 @@ SYMBOLS_COLUMN_NAME, SYMBOLS_COLUMN_TAG, SYMBOLS_COLUMN_TOOLTIP, + SYMBOLS_COLUMN_VALID, SYMBOLS_N_COLUMNS }; Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2011-03-05 22:51:32 UTC (rev 5561) +++ trunk/src/symbols.c 2011-03-05 22:53:13 UTC (rev 5562) @@ -547,6 +547,71 @@ } +/* finds the next iter at any level + * @param iter in/out, the current iter, will be changed to the next one + * @return TRUE if there @p iter was set, or FALSE if there is no next iter */ +static gboolean next_iter(GtkTreeModel *model, GtkTreeIter *iter) +{ + GtkTreeIter guess; + GtkTreeIter copy = *iter; + + /* go down if the item has children */ + if (gtk_tree_model_iter_children(model, &guess, iter)) + *iter = guess; + /* or to the next item at the same level */ + else if (gtk_tree_model_iter_next(model, &copy)) + *iter = copy; + /* or to the next item at a parent level */ + else if (gtk_tree_model_iter_parent(model, &guess, iter)) + { + copy = guess; + while(TRUE) + { + if (gtk_tree_model_iter_next(model, &copy)) + { + *iter = copy; + return TRUE; + } + else if (gtk_tree_model_iter_parent(model, &copy, &guess)) + guess = copy; + else + return FALSE; + } + } + else + return FALSE; + + return TRUE; +} + + +static gboolean find_toplevel_iter(GtkTreeStore *store, GtkTreeIter *iter, const gchar *title) +{ + GtkTreeModel *model = GTK_TREE_MODEL(store); + + if (!gtk_tree_model_get_iter_first(model, iter)) + return FALSE; + do + { + gchar *candidate; + + gtk_tree_model_get(model, iter, SYMBOLS_COLUMN_NAME, &candidate, -1); + /* FIXME: what if 2 different items have the same name? + * this should never happen, but might be caused by a typo in a translation */ + if (utils_str_equal(candidate, title)) + { + g_free(candidate); + return TRUE; + } + else + g_free(candidate); + } + while (gtk_tree_model_iter_next(model, iter)); + + return FALSE; +} + + /* Adds symbol list groups in (iter*, title) pairs. * The list must be ended with NULL. */ static void G_GNUC_NULL_TERMINATED @@ -572,14 +637,15 @@ g_assert(title != NULL); g_ptr_array_add(top_level_iter_names, title); - gtk_tree_store_append(tree_store, iter, NULL); + if (!find_toplevel_iter(tree_store, iter, title)) + gtk_tree_store_append(tree_store, iter, NULL); if (G_IS_OBJECT(icon)) { gtk_tree_store_set(tree_store, iter, SYMBOLS_COLUMN_ICON, icon, -1); g_object_unref(icon); } - gtk_tree_store_set(tree_store, iter, SYMBOLS_COLUMN_NAME, title, -1); + gtk_tree_store_set(tree_store, iter, SYMBOLS_COLUMN_NAME, title, SYMBOLS_COLUMN_VALID, TRUE, -1); } va_end(args); } @@ -1095,6 +1161,29 @@ } +static gboolean find_iter(GtkTreeStore *store, GtkTreeIter *iter, const TMTag *tag) +{ + GtkTreeModel *model = GTK_TREE_MODEL(store); + gboolean found = FALSE; + + if (!gtk_tree_model_get_iter_first(model, iter)) + return FALSE; + do + { + TMTag *candidate; + + gtk_tree_model_get(model, iter, SYMBOLS_COLUMN_TAG, &candidate, -1); + found = (candidate && candidate->type == tag->type && + utils_str_equal(candidate->name, tag->name) && + utils_str_equal(candidate->atts.entry.scope, tag->atts.entry.scope)); + tm_tag_unref(candidate); + } + while (!found && next_iter(model, iter)); + + return found; +} + + static void add_tree_tag(GeanyDocument *doc, const TMTag *tag, GHashTable *parent_hash) { filetype_id ft_id = doc->file_type->id; @@ -1137,13 +1226,30 @@ child = new_iter; } - gtk_tree_store_append(tree_store, child, parent); + if (!find_iter(tree_store, child, tag)) + { + gboolean expand = FALSE; + /* only expand to the iter if the parent was empty, otherwise we let the + * folding as it was before (already expanded, or closed by the user) */ + expand = !gtk_tree_model_iter_has_child(GTK_TREE_MODEL(tree_store), parent); + gtk_tree_store_append(tree_store, child, parent); + if (expand) + { + GtkTreePath *path; + + path = gtk_tree_model_get_path(GTK_TREE_MODEL(tree_store), child); + gtk_tree_view_expand_to_path(GTK_TREE_VIEW(doc->priv->tag_tree), path); + gtk_tree_path_free(path); + } + } + name = get_symbol_name(doc, tag, (parent_name != NULL)); gtk_tree_store_set(tree_store, child, SYMBOLS_COLUMN_ICON, icon, SYMBOLS_COLUMN_NAME, name, SYMBOLS_COLUMN_TAG, tag, + SYMBOLS_COLUMN_VALID, TRUE, -1); if (gtk_check_version(2, 12, 0) == NULL) @@ -1288,6 +1394,53 @@ } +static void invalidate_rows(GtkTreeStore *store) +{ + GtkTreeIter iter; + GtkTreeModel *model = GTK_TREE_MODEL(store); + + if (!gtk_tree_model_get_iter_first(model, &iter)) + return; + do + { + gtk_tree_store_set(store, &iter, SYMBOLS_COLUMN_VALID, FALSE, -1); + } + while (next_iter(model, &iter)); +} + + +static void remove_invalid_rows(GtkTreeStore *store) +{ + GtkTreeIter iter; + GtkTreeModel *model = GTK_TREE_MODEL(store); + gboolean cont; + + cont = gtk_tree_model_get_iter_first(model, &iter); + while (cont) + { + gboolean valid; + + gtk_tree_model_get(model, &iter, SYMBOLS_COLUMN_VALID, &valid, -1); + if (!valid) + { + GtkTreeIter parent; + gboolean have_parent; + + have_parent = gtk_tree_model_iter_parent(model, &parent, &iter); + cont = gtk_tree_store_remove(store, &iter); + /* if there is no next at this level but there is a parent iter, continue from it */ + if (!cont && have_parent) + { + iter = parent; + cont = next_iter(model, &iter); + } + } + else + cont = next_iter(model, &iter); + } +} + + gboolean symbols_recreate_tag_list(GeanyDocument *doc, gint sort_mode) { GList *tags; @@ -1298,19 +1451,22 @@ if (tags == NULL) return FALSE; - /* Make sure the model stays with us after the tree view unrefs it */ - g_object_ref(GTK_TREE_MODEL(doc->priv->tag_store)); - /* Detach model from view */ - gtk_tree_view_set_model(GTK_TREE_VIEW(doc->priv->tag_tree), NULL); - /* Clear all contents */ - gtk_tree_store_clear(doc->priv->tag_store); + /* FIXME: Not sure why we detached the model here? */ + /* disable sorting during update because the code doesn't support correctly + * models that are currently being built */ + gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(doc->priv->tag_store), GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID, 0); + + /* invalidate all content */ + invalidate_rows(doc->priv->tag_store); + /* add grandparent type iters */ add_top_level_items(doc); add_tree_tags(doc, tags); g_list_free(tags); + remove_invalid_rows(doc->priv->tag_store); hide_empty_rows(doc->priv->tag_store); if (sort_mode == SYMBOLS_SORT_USE_PREVIOUS) @@ -1319,12 +1475,6 @@ sort_tree(doc->priv->tag_store, sort_mode == SYMBOLS_SORT_BY_NAME); doc->priv->symbol_list_sort_mode = sort_mode; - /* Re-attach model to view */ - gtk_tree_view_set_model(GTK_TREE_VIEW(doc->priv->tag_tree), - GTK_TREE_MODEL(doc->priv->tag_store)); - g_object_unref(GTK_TREE_MODEL(doc->priv->tag_store)); - gtk_tree_view_expand_all(GTK_TREE_VIEW(doc->priv->tag_tree)); - return TRUE; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5561] trunk/src/sidebar.c
by colombanw＠users.sourceforge.net 05 Mar '11

05 Mar '11

Revision: 5561 http://geany.svn.sourceforge.net/geany/?rev=5561&view=rev Author: colombanw Date: 2011-03-05 22:51:32 +0000 (Sat, 05 Mar 2011) Log Message: ----------- Don't remove and add the symbols tree view if we re-add the same one Modified Paths: -------------- trunk/src/sidebar.c Modified: trunk/src/sidebar.c =================================================================== --- trunk/src/sidebar.c 2011-03-05 22:50:04 UTC (rev 5560) +++ trunk/src/sidebar.c 2011-03-05 22:51:32 UTC (rev 5561) @@ -198,16 +198,26 @@ /* update = rescan the tags for doc->filename */ void sidebar_update_tag_list(GeanyDocument *doc, gboolean update) { - if (gtk_bin_get_child(GTK_BIN(tag_window))) - gtk_container_remove(GTK_CONTAINER(tag_window), gtk_bin_get_child(GTK_BIN(tag_window))); + GtkWidget *child = gtk_bin_get_child(GTK_BIN(tag_window)); + /* changes the tree view to the given one, trying not to do useless changes */ + #define CHANGE_TREE(new_child) \ + G_STMT_START { \ + if (child != new_child) \ + { \ + if (child) \ + gtk_container_remove(GTK_CONTAINER(tag_window), child); \ + gtk_container_add(GTK_CONTAINER(tag_window), new_child); \ + } \ + } G_STMT_END + if (tv.default_tag_tree == NULL) create_default_tag_tree(); /* show default empty tag tree if there are no tags */ if (doc == NULL || doc->file_type == NULL || ! filetype_has_tags(doc->file_type)) { - gtk_container_add(GTK_CONTAINER(tag_window), tv.default_tag_tree); + CHANGE_TREE(tv.default_tag_tree); return; } @@ -228,12 +238,14 @@ if (doc->has_tags) { - gtk_container_add(GTK_CONTAINER(tag_window), doc->priv->tag_tree); + CHANGE_TREE(doc->priv->tag_tree); } else { - gtk_container_add(GTK_CONTAINER(tag_window), tv.default_tag_tree); + CHANGE_TREE(tv.default_tag_tree); } + + #undef CHANGE_TREE } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5560] trunk
by colombanw＠users.sourceforge.net 05 Mar '11

05 Mar '11

Revision: 5560 http://geany.svn.sourceforge.net/geany/?rev=5560&view=rev Author: colombanw Date: 2011-03-05 22:50:04 +0000 (Sat, 05 Mar 2011) Log Message: ----------- Provide a GType for TMTag and use it It is a boxed type but uses reference counting behind the scene. This allow for example the tag store to make sure the tags it holds are always valid. Modified Paths: -------------- trunk/src/sidebar.c trunk/src/symbols.c trunk/tagmanager/include/tm_tag.h trunk/tagmanager/tm_tag.c Modified: trunk/src/sidebar.c =================================================================== --- trunk/src/sidebar.c 2011-03-05 22:48:25 UTC (rev 5559) +++ trunk/src/sidebar.c 2011-03-05 22:50:04 UTC (rev 5560) @@ -216,7 +216,7 @@ if (doc->priv->tag_tree == NULL) { doc->priv->tag_store = gtk_tree_store_new( - SYMBOLS_N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_STRING); + SYMBOLS_N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, TM_TYPE_TAG, G_TYPE_STRING); doc->priv->tag_tree = gtk_tree_view_new(); prepare_taglist(doc->priv->tag_tree, doc->priv->tag_store); gtk_widget_show(doc->priv->tag_tree); @@ -874,6 +874,7 @@ change_focus_to_editor(doc, NULL); } } + tm_tag_unref(tag); } return FALSE; } Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2011-03-05 22:48:25 UTC (rev 5559) +++ trunk/src/symbols.c 2011-03-05 22:50:04 UTC (rev 5560) @@ -1224,7 +1224,8 @@ gpointer user_data) { gboolean sort_by_name = GPOINTER_TO_INT(user_data); - const TMTag *tag_a, *tag_b; + TMTag *tag_a, *tag_b; + gint cmp; gtk_tree_model_get(model, a, SYMBOLS_COLUMN_TAG, &tag_a, -1); gtk_tree_model_get(model, b, SYMBOLS_COLUMN_TAG, &tag_b, -1); @@ -1234,13 +1235,12 @@ if (tag_a && !tag_has_missing_parent(tag_a, GTK_TREE_STORE(model), a) && tag_b && !tag_has_missing_parent(tag_b, GTK_TREE_STORE(model), b)) { - return sort_by_name ? compare_symbol(tag_a, tag_b) : + cmp = sort_by_name ? compare_symbol(tag_a, tag_b) : compare_symbol_lines(tag_a, tag_b); } else { gchar *astr, *bstr; - gint cmp; gtk_tree_model_get(model, a, SYMBOLS_COLUMN_NAME, &astr, -1); gtk_tree_model_get(model, b, SYMBOLS_COLUMN_NAME, &bstr, -1); @@ -1254,23 +1254,28 @@ { /* this is what g_strcmp0() does */ if (! astr) - return -(astr != bstr); + cmp = -(astr != bstr); if (! bstr) - return astr != bstr; + cmp = astr != bstr; + else + { + cmp = strcmp(astr, bstr); - cmp = strcmp(astr, bstr); - - /* sort duplicate 'ScopeName::OverloadedTagName' items by line as well */ - if (tag_a && tag_b) - if (!sort_by_name || - (utils_str_equal(tag_a->name, tag_b->name) && - utils_str_equal(tag_a->atts.entry.scope, tag_b->atts.entry.scope))) - cmp = compare_symbol_lines(tag_a, tag_b); + /* sort duplicate 'ScopeName::OverloadedTagName' items by line as well */ + if (tag_a && tag_b) + if (!sort_by_name || + (utils_str_equal(tag_a->name, tag_b->name) && + utils_str_equal(tag_a->atts.entry.scope, tag_b->atts.entry.scope))) + cmp = compare_symbol_lines(tag_a, tag_b); + } } g_free(astr); g_free(bstr); - return cmp; } + tm_tag_unref(tag_a); + tm_tag_unref(tag_b); + + return cmp; } Modified: trunk/tagmanager/include/tm_tag.h =================================================================== --- trunk/tagmanager/include/tm_tag.h 2011-03-05 22:48:25 UTC (rev 5559) +++ trunk/tagmanager/include/tm_tag.h 2011-03-05 22:50:04 UTC (rev 5560) @@ -30,6 +30,7 @@ */ #include "tm_source_file.h" +#include <glib-object.h> #ifdef __cplusplus extern "C" @@ -159,6 +160,12 @@ */ typedef int (*TMTagCompareFunc) (const void *ptr1, const void *ptr2); +/*! The GType for a TMTag */ +#define TM_TYPE_TAG (tm_tag_get_type()) + +/*! Gets the GType for a TMTag */ +GType tm_tag_get_type(void) G_GNUC_CONST; + /*! Initializes a TMTag structure with information from a tagEntryInfo struct used by the ctags parsers. Note that the TMTag structure must be malloc()ed Modified: trunk/tagmanager/tm_tag.c =================================================================== --- trunk/tagmanager/tm_tag.c 2011-03-05 22:48:25 UTC (rev 5559) +++ trunk/tagmanager/tm_tag.c 2011-03-05 22:50:04 UTC (rev 5560) @@ -9,6 +9,7 @@ #include <stdlib.h> #include <string.h> +#include <glib-object.h> #include "general.h" #include "entry.h" @@ -105,6 +106,17 @@ tm_tag_other_t }; +GType tm_tag_get_type(void) +{ + static GType gtype = 0; + if (G_UNLIKELY (gtype == 0)) + { + gtype = g_boxed_type_register_static("TMTag", (GBoxedCopyFunc)tm_tag_ref, + (GBoxedFreeFunc)tm_tag_unref); + } + return gtype; +} + static int get_tag_type(const char *tag_name) { unsigned int i; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5559] trunk/tagmanager
by colombanw＠users.sourceforge.net 05 Mar '11

05 Mar '11

Revision: 5559 http://geany.svn.sourceforge.net/geany/?rev=5559&view=rev Author: colombanw Date: 2011-03-05 22:48:25 +0000 (Sat, 05 Mar 2011) Log Message: ----------- Make TMTag reference-counted Modified Paths: -------------- trunk/tagmanager/include/tm_tag.h trunk/tagmanager/tm_project.c trunk/tagmanager/tm_source_file.c trunk/tagmanager/tm_tag.c trunk/tagmanager/tm_workspace.c Modified: trunk/tagmanager/include/tm_tag.h =================================================================== --- trunk/tagmanager/include/tm_tag.h 2011-03-05 22:47:13 UTC (rev 5558) +++ trunk/tagmanager/include/tm_tag.h 2011-03-05 22:48:25 UTC (rev 5559) @@ -147,6 +147,7 @@ gboolean inactive; /*!< Whether this file is to be parsed */ } file; } atts; + gint refcount; /*!< the reference count of the tag */ } TMTag; /*! @@ -306,15 +307,29 @@ \sa tm_tag_free() */ void tm_tag_destroy(TMTag *tag); -#endif /*! Destroys all data in the tag and frees the tag structure as well. \param tag Pointer to a TMTag structure */ void tm_tag_free(gpointer tag); +#endif /*! + Drops a reference from a TMTag. If the reference count reaches 0, this function + destroys all data in the tag and frees the tag structure as well. + \param tag Pointer to a TMTag structure +*/ +void tm_tag_unref(TMTag *tag); + +/*! + Adds a reference to a TMTag. + \param tag Pointer to a TMTag structure + \return the passed-in TMTag +*/ +TMTag *tm_tag_ref(TMTag *tag); + +/*! Returns the type of tag as a string \param tag The tag whose type is required */ Modified: trunk/tagmanager/tm_project.c =================================================================== --- trunk/tagmanager/tm_project.c 2011-03-05 22:47:13 UTC (rev 5558) +++ trunk/tagmanager/tm_project.c 2011-03-05 22:48:25 UTC (rev 5559) @@ -396,7 +396,7 @@ #endif if (!force) { - tm_tag_free(tag); + tm_tag_unref(tag); fclose(fp); return FALSE; } @@ -412,7 +412,7 @@ project->file_list = g_ptr_array_new(); g_ptr_array_add(project->file_list, source_file); } - tm_tag_free(tag); + tm_tag_unref(tag); } else { @@ -421,7 +421,7 @@ #ifdef TM_DEBUG g_warning("Dangling tag %s", tag->name); #endif - tm_tag_free(tag); + tm_tag_unref(tag); if (!force) { fclose(fp); Modified: trunk/tagmanager/tm_source_file.c =================================================================== --- trunk/tagmanager/tm_source_file.c 2011-03-05 22:47:13 UTC (rev 5558) +++ trunk/tagmanager/tm_source_file.c 2011-03-05 22:48:25 UTC (rev 5559) @@ -324,7 +324,7 @@ if (NULL != (tag = tm_tag_new(TM_SOURCE_FILE(source_file), NULL))) { tm_tag_write(tag, fp, tm_tag_attr_max_t); - tm_tag_free(tag); + tm_tag_unref(tag); if (NULL != source_file->tags_array) { for (i=0; i < source_file->tags_array->len; ++i) Modified: trunk/tagmanager/tm_tag.c =================================================================== --- trunk/tagmanager/tm_tag.c 2011-03-05 22:47:13 UTC (rev 5558) +++ trunk/tagmanager/tm_tag.c 2011-03-05 22:48:25 UTC (rev 5559) @@ -129,6 +129,7 @@ gboolean tm_tag_init(TMTag *tag, TMSourceFile *file, const tagEntryInfo *tag_entry) { + tag->refcount = 1; if (NULL == tag_entry) { /* This is a file tag */ @@ -224,6 +225,7 @@ gboolean status; guchar changed_char = TA_NAME; + tag->refcount = 1; if ((NULL == fgets((gchar*)buf, BUFSIZ, fp)) || ('\0' == *buf)) return FALSE; for (start = end = buf, status = TRUE; (TRUE == status); start = end, ++ end) @@ -327,6 +329,7 @@ gboolean status; /*guchar changed_char = TA_NAME;*/ + tag->refcount = 1; if ((NULL == fgets((gchar*)buf, BUFSIZ, fp)) || ('\0' == *buf)) return FALSE; { @@ -436,15 +439,30 @@ } } +#if 0 void tm_tag_free(gpointer tag) { - if (NULL != tag) + tm_tag_unref(tag); +} +#endif + +void tm_tag_unref(TMTag *tag) +{ + /* be NULL-proof because tm_tag_free() was NULL-proof and we indent to be a + * drop-in replacment of it */ + if (NULL != tag && g_atomic_int_dec_and_test(&tag->refcount)) { - tm_tag_destroy((TMTag *) tag); + tm_tag_destroy(tag); TAG_FREE(tag); } } +TMTag *tm_tag_ref(TMTag *tag) +{ + g_atomic_int_inc(&tag->refcount); + return tag; +} + int tm_tag_compare(const void *ptr1, const void *ptr2) { unsigned int *sort_attr; @@ -603,7 +621,7 @@ { guint i; for (i = 0; i < tags_array->len; ++i) - tm_tag_free(tags_array->pdata[i]); + tm_tag_unref(tags_array->pdata[i]); if (free_all) g_ptr_array_free(tags_array, TRUE); else Modified: trunk/tagmanager/tm_workspace.c =================================================================== --- trunk/tagmanager/tm_workspace.c 2011-03-05 22:47:13 UTC (rev 5558) +++ trunk/tagmanager/tm_workspace.c 2011-03-05 22:48:25 UTC (rev 5559) @@ -82,7 +82,7 @@ if (theWorkspace->global_tags) { for (i=0; i < theWorkspace->global_tags->len; ++i) - tm_tag_free(theWorkspace->global_tags->pdata[i]); + tm_tag_unref(theWorkspace->global_tags->pdata[i]); g_ptr_array_free(theWorkspace->global_tags, TRUE); } tm_work_object_destroy(TM_WORK_OBJECT(theWorkspace)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5558] trunk/src/symbols.c
by colombanw＠users.sourceforge.net 05 Mar '11

05 Mar '11

Revision: 5558 http://geany.svn.sourceforge.net/geany/?rev=5558&view=rev Author: colombanw Date: 2011-03-05 22:47:13 +0000 (Sat, 05 Mar 2011) Log Message: ----------- Improve implementation of hide_empty_rows() to do all in one shot Modified Paths: -------------- trunk/src/symbols.c Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2011-03-05 22:46:32 UTC (rev 5557) +++ trunk/src/symbols.c 2011-03-05 22:47:13 UTC (rev 5558) @@ -900,30 +900,21 @@ } -/* the following code surely can be improved, at the moment it collects some iters - * for removal and after that the actual removal is done. I didn't find a way to find and remove - * an empty row in one loop (next iter fails then) */ +/* removes toplevel items that have no children */ static void hide_empty_rows(GtkTreeStore *store) { - GtkTreeIter iter, *iters[MAX_SYMBOL_TYPES] = { NULL }; - guint i = 0; + GtkTreeIter iter; + gboolean cont = TRUE; if (! gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter)) return; /* stop when first iter is invalid, i.e. no elements */ - do /* first collect the iters we need to delete empty rows */ + while (cont) { if (! gtk_tree_model_iter_has_child(GTK_TREE_MODEL(store), &iter)) - iters[i++] = gtk_tree_iter_copy(&iter); - } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter)); - - /* now actually delete the collected iters */ - for (i = 0; i < MAX_SYMBOL_TYPES; i++) - { - if (G_UNLIKELY(iters[i] == NULL)) - break; - gtk_tree_store_remove(store, iters[i]); - gtk_tree_iter_free(iters[i]); + cont = gtk_tree_store_remove(store, &iter); + else + cont = gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2011