threads.c: commented out try_critical_section() , I don't want this

diff --git a/citadel/server/modules_init.c b/citadel/server/modules_init.c
index 3f607eb6829c3267a98c8a825cccd4f209248807..b27c2fe1bbff04259283da6640f261685ea15a2f 100644 (file)
--- a/citadel/server/modules_init.c
+++ b/citadel/server/modules_init.c
@@ -42,7 +42,11 @@ void initialize_modules(int is_threading) {
        syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_syscmd());
        syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_serv_user());
        syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_expire());
-       //syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_fulltext());                // FIXME trying this
+
+       // FIXME
+       // There is something in this module that fux0rs the new backend, causing it to deadlock.
+       // syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_fulltext());
+
        syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_image());
        syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_imap());
        syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_sieve());

diff --git a/citadel/server/threads.c b/citadel/server/threads.c
index 0caa2a7fb0948e2a9f8fcdb7334f272f746ee751..6b782a673d684d5e8fb4c5719dbd7342c4dc1273 100644 (file)
--- a/citadel/server/threads.c
+++ b/citadel/server/threads.c
@@ -36,17 +36,17 @@ void InitializeSemaphores(void) {
 
 
 // Obtain a semaphore lock to begin a critical section, but only if no one else has one
-int try_critical_section(int which_one) {
+//int try_critical_section(int which_one) {
        // For all types of critical sections except those listed here,
        // ensure nobody ever tries to do a critical section within a
        // transaction; this could lead to deadlock.
-       if (    (which_one != S_FLOORCACHE)
-               && (which_one != S_NETCONFIGS)
-       ) {
-               cdb_check_handles();
-       }
-       return (pthread_mutex_trylock(&Critters[which_one]));
-}
+       //if (  (which_one != S_FLOORCACHE)
+               //&& (which_one != S_NETCONFIGS)
+       //) {
+               //cdb_check_handles();
+       //}
+       //return (pthread_mutex_trylock(&Critters[which_one]));
+//}
 
 
 // Obtain a semaphore lock to begin a critical section.

diff --git a/citadel/server/threads.h b/citadel/server/threads.h
index e55aa394c2642afa8ddacff793b5c519a192dbc7..0e28333eeb3dedf90d3593bdf84f7b07b67ba44e 100644 (file)
--- a/citadel/server/threads.h
+++ b/citadel/server/threads.h
@@ -17,7 +17,7 @@ extern int num_workers;
 extern int active_workers;
 extern int server_shutting_down;
 
-int try_critical_section (int which_one);
+//int try_critical_section (int which_one);
 void begin_critical_section (int which_one);
 void end_critical_section (int which_one);
 void go_threading(void);