Changeset: 033b0bd636fb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=033b0bd636fb
Modified Files:
        tools/merovingian/daemon/controlrunner.c
Branch: default
Log Message:

[monetdbd] Try to stop the profiler before stopping the server


diffs (17 lines):

diff --git a/tools/merovingian/daemon/controlrunner.c 
b/tools/merovingian/daemon/controlrunner.c
--- a/tools/merovingian/daemon/controlrunner.c
+++ b/tools/merovingian/daemon/controlrunner.c
@@ -344,6 +344,13 @@ static void ctl_handle_client(
                                                        char *dbname = 
strdup(dp->dbname);
                                                        mtype type = dp->type;
                                                        
pthread_mutex_unlock(&_mero_topdp_lock);
+                                                       /* Try to shutdown the 
profiler before the DB.
+                                                        * If we are unable to 
shutdown the profiler, we
+                                                        * should still try to 
shutdown the server. In
+                                                        * other words: ignore 
any errors that shutdown_profiler
+                                                        * may have encountered.
+                                                        */
+                                                       
shutdown_profiler(dbname, &stats);
                                                        terminateProcess(pid, 
dbname, type, 1);
                                                        Mfprintf(_mero_ctlout, 
"%s: stopped "
                                                                        
"database '%s'\n", origin, q);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to