anjuta r3906 - in trunk: . plugins/symbol-db
- From: jhs svn gnome org
- To: svn-commits-list gnome org
- Subject: anjuta r3906 - in trunk: . plugins/symbol-db
- Date: Thu, 1 May 2008 11:14:58 +0100 (BST)
Author: jhs
Date: Thu May 1 10:14:58 2008
New Revision: 3906
URL: http://svn.gnome.org/viewvc/anjuta?rev=3906&view=rev
Log:
2008-05-01 Massimo Cora\' <maxcvs email it>
* plugins/symbol-db/plugin.c (on_single_file_scan_end):
set message \'Generating inheritances...\' when doing sdb_engine_second_pass_do ()
* plugins/symbol-db/symbol-db-engine.c (sdb_engine_cache_lookup),
(sdb_engine_init_caches), (sdb_engine_ctags_output_thread),
(sdb_engine_thread_monitor), (sdb_engine_init),
(sdb_engine_add_new_sym_kind), (sdb_engine_add_new_sym_access),
(sdb_engine_add_new_sym_implementation),
(sdb_engine_second_pass_update_scope_1),
(sdb_engine_second_pass_update_scope),
(sdb_engine_second_pass_update_heritage),
(symbol_db_engine_update_project_symbols),
(symbol_db_engine_get_files_with_zero_symbols),
(symbol_db_engine_get_file_symbols):
fixed a population bug introduced with using of caches. It broke the kind
of symbol in some cases (e.g. returning of table_id = -1).
Avoid lazy initialization and inlined the lookup functions to speed up the
thing.
Performances improvement in sdb_engine_second_pass_update_heritage () using
a prepared query (libgda parser now rulez!). Some fixes to the lock ()/unlock ()
logic in this part should avoid gui freezing, at least here it does not freeze.
* plugins/symbol-db/symbol-db-view-locals.c
(symbol_db_view_locals_recv_signals_from_engine):
* plugins/symbol-db/symbol-db-view.c
(symbol_db_view_recv_signals_from_engine):
greyed out trees while population is in place.
Modified:
trunk/ChangeLog
trunk/plugins/symbol-db/plugin.c
trunk/plugins/symbol-db/symbol-db-engine.c
trunk/plugins/symbol-db/symbol-db-view-locals.c
trunk/plugins/symbol-db/symbol-db-view.c
Modified: trunk/plugins/symbol-db/plugin.c
==============================================================================
--- trunk/plugins/symbol-db/plugin.c (original)
+++ trunk/plugins/symbol-db/plugin.c Thu May 1 10:14:58 2008
@@ -716,7 +716,10 @@
sdb_plugin = ANJUTA_PLUGIN_SYMBOL_DB (plugin);
sdb_plugin->files_count_done++;
- message = g_strdup_printf (_("%d files scanned out of %d"),
+ if (sdb_plugin->files_count_done >= sdb_plugin->files_count)
+ message = g_strdup_printf (_("Generating inheritances..."));
+ else
+ message = g_strdup_printf (_("%d files scanned out of %d"),
sdb_plugin->files_count_done, sdb_plugin->files_count);
DEBUG_PRINT ("on_single_file_scan_end (): %d out of %d", sdb_plugin->files_count_done,
Modified: trunk/plugins/symbol-db/symbol-db-engine.c
==============================================================================
--- trunk/plugins/symbol-db/symbol-db-engine.c (original)
+++ trunk/plugins/symbol-db/symbol-db-engine.c Thu May 1 10:14:58 2008
@@ -194,6 +194,7 @@
PREP_QUERY_GET_REMOVED_IDS,
PREP_QUERY_TMP_REMOVED_DELETE_ALL,
PREP_QUERY_COUNT
+
} query_type;
@@ -292,7 +293,7 @@
},
{
PREP_QUERY_GET_ALL_FROM_FILE_WHERE_NOT_IN_SYMBOLS,
- "SELECT * FROM file WHERE file_id NOT IN (SELECT file_defined_id FROM symbol)",
+ "SELECT file_id, file_path FROM file WHERE file_id NOT IN (SELECT file_defined_id FROM symbol)",
NULL
},
/* -- language -- */
@@ -511,9 +512,9 @@
PREP_QUERY_GET_SYMBOL_ID_BY_CLASS_NAME_AND_NAMESPACE,
"SELECT symbol_id FROM symbol JOIN scope ON symbol.scope_id = "
"scope.scope_id JOIN sym_type ON scope.type_id = sym_type.type_id "
- "WHERE symbol.name = /* name:'klassname' type:gchararray */ AND "
- "scope.scope_name = /* name:'namespacename' type:gchararray */ AND "
- "sym_type.type_type='namespace'",
+ "WHERE symbol.name = ## /* name:'klassname' type:gchararray */ AND "
+ "scope.scope_name = ## /* name:'namespacename' type:gchararray */ AND "
+ "sym_type.type_type = 'namespace' LIMIT 1",
NULL,
NULL
},
@@ -737,41 +738,34 @@
static GObjectClass *parent_class = NULL;
-
-static void sdb_engine_second_pass_do (SymbolDBEngine * dbe);
+/* some forward declarations */
+static void
+sdb_engine_second_pass_do (SymbolDBEngine * dbe);
static gint
sdb_engine_add_new_symbol (SymbolDBEngine * dbe, tagEntry * tag_entry,
int file_defined_id,
gboolean sym_update);
-static gint
-sdb_engine_cache_lookup (GHashTable** hash_table, const gchar* lookup)
+static inline gint
+sdb_engine_cache_lookup (GHashTable* hash_table, const gchar* lookup)
{
- if (*hash_table == NULL)
- {
- *hash_table = g_hash_table_new_full (g_str_hash,
- g_str_equal,
- g_free,
- NULL);
- }
- else
+ gpointer orig_key = NULL;
+ gpointer value = NULL;
+
+ /* avoid lazy initialization may gain some cpu cycles. Just lookup here. */
+ if (g_hash_table_lookup_extended (hash_table,
+ lookup,
+ &orig_key,
+ &value))
{
- gpointer orig_key = NULL;
- gpointer value = NULL;
- if (g_hash_table_lookup_extended (*hash_table,
- lookup,
- &orig_key,
- &value))
- {
- gint table_id = GPOINTER_TO_INT (value);
- return table_id;
- }
+ gint table_id = GPOINTER_TO_INT (value);
+ return table_id;
}
return -1;
}
-static void
+static inline void
sdb_engine_insert_cache (GHashTable* hash_table, const gchar* key,
gint value)
{
@@ -794,6 +788,27 @@
priv->implementation_cache = NULL;
}
+static void
+sdb_engine_init_caches (SymbolDBEngine* dbe)
+{
+ SymbolDBEnginePriv *priv = dbe->priv;
+ priv->kind_cache = g_hash_table_new_full (g_str_hash,
+ g_str_equal,
+ g_free,
+ NULL);
+
+ priv->access_cache = g_hash_table_new_full (g_str_hash,
+ g_str_equal,
+ g_free,
+ NULL);
+
+ priv->implementation_cache = g_hash_table_new_full (g_str_hash,
+ g_str_equal,
+ g_free,
+ NULL);
+}
+
+
static gboolean
sdb_engine_execute_unknown_sql (SymbolDBEngine *dbe, const gchar *sql)
{
@@ -1606,14 +1621,14 @@
gint tmp_updated;
/* proceed with second passes */
- DEBUG_PRINT ("FOUND end-of-group-files marker.\n"
+ DEBUG_PRINT ("FOUND end-of-group-files marker."
"go on with sdb_engine_second_pass_do ()");
chars_ptr += len_marker;
remaining_chars -= len_marker;
/* will emit symbol_scope_updated */
- sdb_engine_second_pass_do (dbe);
+ sdb_engine_second_pass_do (dbe);
/* Here we are. It's the right time to notify the listeners
* about out fresh new inserted/updated symbols...
@@ -1677,6 +1692,7 @@
priv->thread_status = FALSE;
priv->concurrent_threads--;
+ /* unlock */
if (priv->mutex)
g_mutex_unlock (priv->mutex);
@@ -1774,7 +1790,6 @@
g_return_val_if_fail (data != NULL, FALSE);
priv = dbe->priv;
-/* DEBUG_PRINT ("thread monitor");*/
if (priv->concurrent_threads > THREADS_MAX_CONCURRENT) {
/* monitor acted here. There are plenty threads already working. */
@@ -2107,6 +2122,9 @@
/* create Anjuta Launcher instance. It will be used for tags parsing. */
sdbe->priv->ctags_launcher = NULL;
+
+ /* init cache hashtables */
+ sdb_engine_init_caches (sdbe);
}
static void
@@ -3061,7 +3079,7 @@
if (kind_name == NULL)
return -1;
- table_id = sdb_engine_cache_lookup (&priv->kind_cache, kind_name);
+ table_id = sdb_engine_cache_lookup (priv->kind_cache, kind_name);
if (table_id != -1)
{
return table_id;
@@ -3113,11 +3131,12 @@
{
const GValue *value = gda_set_get_holder_value (last_inserted, "+0");
table_id = g_value_get_int (value);
+ /* we should cache only tables which are != -1 */
+ sdb_engine_insert_cache (priv->kind_cache, kind_name, table_id);
}
}
- gda_value_free (value);
+ gda_value_free (value);
- sdb_engine_insert_cache (priv->kind_cache, kind_name, table_id);
return table_id;
}
@@ -3143,7 +3162,7 @@
return -1;
}
- table_id = sdb_engine_cache_lookup (&priv->access_cache, access);
+ table_id = sdb_engine_cache_lookup (priv->access_cache, access);
if (table_id != -1)
{
return table_id;
@@ -3195,10 +3214,12 @@
{
const GValue *value = gda_set_get_holder_value (last_inserted, "+0");
table_id = g_value_get_int (value);
+ /* we should cache only tables which are != -1 */
+ sdb_engine_insert_cache (priv->access_cache, access, table_id);
}
}
gda_value_free (value);
- sdb_engine_insert_cache (priv->access_cache, access, table_id);
+
return table_id;
}
@@ -3226,7 +3247,7 @@
/* no implementation associated with current tag */
return -1;
}
- table_id = sdb_engine_cache_lookup (&priv->implementation_cache, implementation);
+ table_id = sdb_engine_cache_lookup (priv->implementation_cache, implementation);
if (table_id != -1)
{
return table_id;
@@ -3276,11 +3297,14 @@
else
{
const GValue *value = gda_set_get_holder_value (last_inserted, "+0");
- table_id = g_value_get_int (value);
+ table_id = g_value_get_int (value);
+ /* we should cache only tables which are != -1 */
+ sdb_engine_insert_cache (priv->implementation_cache, implementation,
+ table_id);
}
}
gda_value_free (value);
- sdb_engine_insert_cache (priv->implementation_cache, implementation, table_id);
+
return table_id;
}
@@ -3705,6 +3729,10 @@
value2 = gda_value_new (G_TYPE_STRING);
g_value_set_string (value2, object_name);
+ /* we're gonna access db. Lets lock here */
+ if (priv->mutex)
+ g_mutex_lock (priv->mutex);
+
if ((scope_id = sdb_engine_get_tuple_id_by_unique_name2 (dbe,
PREP_QUERY_GET_SYMBOL_SCOPE_DEFINITION_ID,
"tokenname",
@@ -3717,6 +3745,9 @@
gda_value_free (value1);
gda_value_free (value2);
+ if (priv->mutex)
+ g_mutex_unlock (priv->mutex);
+
return -1;
}
gda_value_free (value1);
@@ -3738,6 +3769,8 @@
== NULL)
{
g_warning ("query is null");
+ if (priv->mutex)
+ g_mutex_unlock (priv->mutex);
return -1;
}
@@ -3747,6 +3780,8 @@
if ((param = gda_set_get_holder ((GdaSet*)plist, "scopeid")) == NULL)
{
g_warning ("param scopeid is NULL from pquery!");
+ if (priv->mutex)
+ g_mutex_unlock (priv->mutex);
return -1;
}
@@ -3758,6 +3793,8 @@
if ((param = gda_set_get_holder ((GdaSet*)plist, "symbolid")) == NULL)
{
g_warning ("param symbolid is NULL from pquery!");
+ if (priv->mutex)
+ g_mutex_unlock (priv->mutex);
return -1;
}
@@ -3772,7 +3809,8 @@
(GdaSet*)plist, NULL,
NULL);
-
+ if (priv->mutex)
+ g_mutex_unlock (priv->mutex);
return symbol_referer_id;
}
@@ -3785,6 +3823,7 @@
static void
sdb_engine_second_pass_update_scope (SymbolDBEngine * dbe, GdaDataModel * data)
{
+ SymbolDBEnginePriv *priv;
/*
* Fill up the scope.
* The case: "my_foo_func_1" is the name of the current tag parsed.
@@ -3800,14 +3839,21 @@
*/
gint i;
+ priv = dbe->priv;
+
+ /* temporary unlock. This function may take a while to be completed
+ * so let other db-task to be executed, so that main thread
+ * isn't locked up.
+ * sdb_engine_second_pass_update_scope_1 () which is called later on will
+ * access db and then will lock again.
+ */
+ if (priv->mutex)
+ g_mutex_unlock (priv->mutex);
+
for (i = 0; i < gda_data_model_get_n_rows (data); i++)
{
GValue *value;
- /* Avoid lookup */
- g_mutex_unlock (dbe->priv->mutex);
- g_mutex_lock (dbe->priv->mutex);
-
if ((value =
(GValue *) gda_data_model_get_value_at_col_name (data,
"field_class",
@@ -3862,6 +3908,11 @@
value);
}
}
+
+ /* relock */
+ if (priv->mutex)
+ g_mutex_lock (priv->mutex);
+
}
@@ -3880,6 +3931,10 @@
priv = dbe->priv;
+ /* unlock */
+ if (priv->mutex)
+ g_mutex_unlock (dbe->priv->mutex);
+
for (i = 0; i < gda_data_model_get_n_rows (data); i++)
{
const GValue *value;
@@ -3888,10 +3943,6 @@
gchar **inherits_list;
gint j;
- /* Avoid lookup */
- g_mutex_unlock (dbe->priv->mutex);
- g_mutex_lock (dbe->priv->mutex);
-
value = gda_data_model_get_value_at_col_name (data,
"field_inherits", i);
inherits = g_value_get_string (value);
@@ -3984,6 +4035,10 @@
derived_klass_id = 0;
}
+ /* we're on the query side of the function. It needs some locking... */
+ if (priv->mutex)
+ g_mutex_lock (dbe->priv->mutex);
+
/* ok, search for the symbol_id of the base class */
if (namespace_name == NULL)
{
@@ -3991,7 +4046,7 @@
value1 = gda_value_new (G_TYPE_STRING);
g_value_set_string (value1, klass_name);
-
+
if ((base_klass_id =
sdb_engine_get_tuple_id_by_unique_name (dbe,
PREP_QUERY_GET_SYMBOL_ID_BY_CLASS_NAME,
@@ -3999,17 +4054,16 @@
value1)) < 0)
{
gda_value_free (value1);
+
+ if (priv->mutex)
+ g_mutex_unlock (dbe->priv->mutex);
+
continue;
}
- gda_value_free (value1);
+ gda_value_free (value1);
}
else
{
-/* FIXME:
-when Libgda will parse correctly the PREP_QUERY_GET_SYMBOL_ID_BY_CLASS_NAME_AND_NAMESPACE
-query please uncomment this section and let the prepared statements do their
-work.
-
GValue *value1;
GValue *value2;
@@ -4030,41 +4084,14 @@
{
gda_value_free (value1);
gda_value_free (value2);
+
+ if (priv->mutex)
+ g_mutex_unlock (dbe->priv->mutex);
+
continue;
}
gda_value_free (value1);
gda_value_free (value2);
-*/
- GValue *value1;
- GdaDataModel *base_data;
- gchar *query_str;
- query_str =
- g_strdup_printf ("SELECT symbol_id FROM symbol JOIN scope ON "
- "symbol.scope_id=scope.scope_id JOIN sym_type ON "
- "scope.type_id=sym_type.type_id WHERE "
- "symbol.name='%s' AND scope.scope_name='%s' AND "
- "sym_type.type_type='namespace'",
- klass_name, namespace_name);
-
- if ((base_data =
- sdb_engine_execute_select_sql (dbe, query_str)) == NULL ||
- gda_data_model_get_n_rows (base_data) <= 0 )
- {
- g_free (query_str);
-
- if (base_data != NULL)
- g_object_unref (base_data);
-
- continue;
- }
-
- value1 = (GValue*)gda_data_model_get_value_at (base_data, 0, 0);
- base_klass_id = g_value_get_int (value1);
- DEBUG_PRINT ("found base_klass_id %d", base_klass_id );
- g_free (query_str);
-
- if (base_data != NULL)
- g_object_unref (base_data);
}
g_free (namespace_name);
@@ -4074,10 +4101,18 @@
"base_klass_id %d, derived_klass_id %d", base_klass_id,
derived_klass_id);
sdb_engine_add_new_heritage (dbe, base_klass_id, derived_klass_id);
+ if (priv->mutex)
+ g_mutex_unlock (dbe->priv->mutex);
+
}
- g_strfreev (inherits_list);
+ g_strfreev (inherits_list);
}
+
+ /* relock before leaving... */
+ if (priv->mutex)
+ g_mutex_lock (dbe->priv->mutex);
+
}
/**
@@ -4615,7 +4650,7 @@
/**
* WARNING: do not use this function thinking that it would do a scan of symbols
* too. Use symbol_db_engine_update_files_symbols () instead. This one will set
- * up some things on db, like removing the 'old' files which have not been
+ * up some things on db, like removing the 'old' symbols which have not been
* updated.
*/
static gboolean
@@ -5007,7 +5042,8 @@
return FALSE;
}
- plist = sdb_engine_get_query_parameters_list (dbe, PREP_QUERY_GET_ALL_FROM_FILE_BY_PROJECT_ID);
+ plist = sdb_engine_get_query_parameters_list (dbe,
+ PREP_QUERY_GET_ALL_FROM_FILE_BY_PROJECT_ID);
/* prjid parameter */
if ((param = gda_set_get_holder ((GdaSet*)plist, "prjid")) == NULL)
@@ -5532,9 +5568,7 @@
priv = dbe->priv;
if (priv->mutex)
- {
- g_mutex_lock (priv->mutex);
- }
+ g_mutex_lock (priv->mutex);
if ((stmt = sdb_engine_get_statement_by_query_id (dbe,
PREP_QUERY_GET_ALL_FROM_FILE_WHERE_NOT_IN_SYMBOLS))
@@ -5542,6 +5576,7 @@
{
if (priv->mutex)
g_mutex_unlock (priv->mutex);
+ return NULL;
}
data_model = gda_connection_statement_execute_select (priv->db_connection,
@@ -6985,6 +7020,9 @@
return NULL;
}
+/* DEBUG_PRINT ("query for symbol_db_engine_get_file_symbols is %s [filepath: %s]",
+ dyn_node->query_str, file_path);*/
+
if ((param = gda_set_get_holder ((GdaSet*)dyn_node->plist, "filepath")) == NULL)
{
if (priv->mutex)
Modified: trunk/plugins/symbol-db/symbol-db-view-locals.c
==============================================================================
--- trunk/plugins/symbol-db/symbol-db-view-locals.c (original)
+++ trunk/plugins/symbol-db/symbol-db-view-locals.c Thu May 1 10:14:58 2008
@@ -1148,6 +1148,8 @@
if (enable_status == TRUE)
{
+ gtk_widget_set_sensitive (GTK_WIDGET (dbvl), TRUE);
+
priv->recv_signals = TRUE;
/* connect some signals */
if (priv->insert_handler <= 0)
@@ -1170,6 +1172,8 @@
}
else /* disconnect them, if they were ever connected before */
{
+ gtk_widget_set_sensitive (GTK_WIDGET (dbvl), FALSE);
+
priv->recv_signals = FALSE;
if (priv->insert_handler >= 0)
{
Modified: trunk/plugins/symbol-db/symbol-db-view.c
==============================================================================
--- trunk/plugins/symbol-db/symbol-db-view.c (original)
+++ trunk/plugins/symbol-db/symbol-db-view.c Thu May 1 10:14:58 2008
@@ -1779,9 +1779,10 @@
g_return_if_fail (dbv != NULL);
priv = dbv->priv;
-
+
if (enable_status == TRUE)
{
+ gtk_widget_set_sensitive (GTK_WIDGET (dbv), TRUE);
/* connect some signals */
if (priv->insert_handler <= 0)
{
@@ -1803,6 +1804,8 @@
}
else /* disconnect them, if they were ever connected before */
{
+ gtk_widget_set_sensitive (GTK_WIDGET (dbv), FALSE);
+
if (priv->insert_handler >= 0)
{
g_signal_handler_disconnect (G_OBJECT (dbe), priv->insert_handler);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
