evolution-data-server r9189 - trunk/camel

[sragavan svn gnome org]

Author: sragavan
Date: Fri Jul 25 04:21:21 2008
New Revision: 9189
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9189&view=rev

Log:
2008-07-25  Srinivasa Ragavan  <sragavan novell com>

	** Reverse the meaning of debug/free safe handlers. Let it crash now, than
	on a production build. We can fix it now. It would be turned off for a
	release build. (CAMEL_SQLITE_FREE_CACHE, CAMEL_SQLITE_SHARED_CACHE,
	CAMEL_FREE_INFOS, CDS_DEBUG)

	* camel/camel-db.h:
	* camel/camel-folder-summary.c:
	* camel/camel-string-utils.c:


Modified:
   trunk/camel/ChangeLog
   trunk/camel/camel-db.h
   trunk/camel/camel-folder-summary.c
   trunk/camel/camel-string-utils.c

Modified: trunk/camel/camel-db.h
==============================================================================
--- trunk/camel/camel-db.h	(original)
+++ trunk/camel/camel-db.h	Fri Jul 25 04:21:21 2008
@@ -15,8 +15,8 @@
 
 #define CAMEL_DB_FREE_CACHE_SIZE 2 * 1024 * 1024
 #define CAMEL_DB_SLEEP_INTERVAL 1*10*10
-#define CAMEL_DB_RELEASE_SQLITE_MEMORY if(g_getenv("CAMEL_SQLITE_FREE_CACHE")) sqlite3_release_memory(CAMEL_DB_FREE_CACHE_SIZE);
-#define CAMEL_DB_USE_SHARED_CACHE if(g_getenv("CAMEL_SQLITE_SHARED_CACHE")) sqlite3_enable_shared_cache(TRUE);
+#define CAMEL_DB_RELEASE_SQLITE_MEMORY if(!g_getenv("CAMEL_SQLITE_FREE_CACHE")) sqlite3_release_memory(CAMEL_DB_FREE_CACHE_SIZE);
+#define CAMEL_DB_USE_SHARED_CACHE if(!g_getenv("CAMEL_SQLITE_SHARED_CACHE")) sqlite3_enable_shared_cache(TRUE);
 
 
 /* The extensive DB format, supporting basic searching and sorting

Modified: trunk/camel/camel-folder-summary.c
==============================================================================
--- trunk/camel/camel-folder-summary.c	(original)
+++ trunk/camel/camel-folder-summary.c	Fri Jul 25 04:21:21 2008
@@ -836,7 +836,7 @@
 	s->cache_load_time = time (NULL);
 
         #warning "LRU please and not timeouts"
-	if (g_getenv("CAMEL_FREE_INFOS")) 
+	if (!g_getenv("CAMEL_FREE_INFOS")) 
 		s->timeout_handle = g_timeout_add_seconds (SUMMARY_CACHE_DROP, (GSourceFunc) cfs_try_release_memory, s);
 
 	return ret == 0 ? 0 : -1;

Modified: trunk/camel/camel-string-utils.c
==============================================================================
--- trunk/camel/camel-string-utils.c	(original)
+++ trunk/camel/camel-string-utils.c	Fri Jul 25 04:21:21 2008
@@ -240,7 +240,7 @@
 		if (count == 0) {
 			g_hash_table_remove(pstring_table, p);
 			g_free(p);
-			if (g_getenv("CDS_DEBUG")) { 
+			if (!g_getenv("CDS_DEBUG")) { 
 				if (p != s) /* Only for debugging purposes */
 					g_assert(0);
 			}
@@ -248,7 +248,7 @@
 			g_hash_table_insert(pstring_table, p, GINT_TO_POINTER(count));
 		}
 	} else {
-		if (g_getenv("CDS_DEBUG")) {
+		if (!g_getenv("CDS_DEBUG")) {
 			g_warning("Trying to free string not allocated from the pool '%s'", s);
 			/*Only for debugging purposes */
 			g_assert (0);