X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=.inspircd.inc;h=ed22f731744f889003c466d1f04231a004086841;hb=bf797a387992895ee25ed02f58bded8ce56ef378;hp=67daff2fe28aa830eb577581dafae034907bcdee;hpb=a3962aa85ac61180ea8f910fa55b28e56030b092;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/.inspircd.inc b/.inspircd.inc
index 67daff2fe..ed22f7317 100644
--- a/.inspircd.inc
+++ b/.inspircd.inc
@@ -27,6 +27,9 @@ getpidfile($confpath."inspircd.conf");
 
 if ($arg eq "start") { start(); exit(); }
 if ($arg eq "debug") { debug(); exit(); }
+if ($arg eq "screendebug") { screendebug(); exit() }
+if ($arg eq "valdebug") { valdebug(); exit(); }
+if ($arg eq "screenvaldebug") { screenvaldebug(); exit(); }
 if ($arg eq "stop") { stop(); exit(); }
 if ($arg eq "status") {
 	if (getstatus() == 1) { 
@@ -57,6 +60,7 @@ if ($arg eq "cron") {
 
 if ($arg eq "restart") {
 	stop();
+	unlink($pidfile) if (-e $pidfile);
 	start();
 	# kthxbye();
 	exit();
@@ -84,17 +88,65 @@ sub start {
         if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
         # If we are still alive here.. Try starting the IRCd..
         system("$binpath/$executable");
-	sleep 2;
         return 1;
 }
 
 sub debug {
-        # Check to see its not 'running' already.
-        if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
-        # If we are still alive here.. Try starting the IRCd..
-        system("gdb --args $binpath/$executable -nofork -debug");
+	# Check to see its not 'running' already.
+	if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
+		
+	# Check we have gdb
+	checkgdb();
+		
+	# If we are still alive here.. Try starting the IRCd..
+	system("gdb --command=.gdbargs --args $binpath/$executable -nofork -debug -nolog");
+}
+
+sub screendebug
+{
+	# Check to see its not 'running' already.
+	if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
+	
+	#Check we have gdb
+	checkgdb();
+	checkscreen();
+	
+	# If we are still alive here.. Try starting the IRCd..
+	print "Starting InspIRCd in `screen`, type `screen -r` when the ircd crashes to view the gdb output and get a backtrace.\n";
+	print "Once you're inside the screen session press ^C + d to re-detach from the session\n";
+	system("screen -m -d gdb --command=.gdbargs --args $binpath/$executable -nofork -debug -nolog");
 }
 
+sub valdebug
+{
+	# Check to see its not 'running' already.
+	if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
+
+	# Check we have valgrind and gdb
+	checkvalgrind();
+	checkgdb();
+	
+	# If we are still alive here.. Try starting the IRCd..
+	# May want to do something with these args at some point: --suppressions=.inspircd.sup --gen-suppressions=yes
+	# Could be useful when we want to stop it complaining about things we're sure aren't issues.
+	system("valgrind -v --tool=memcheck --leak-check=yes --db-attach=yes --num-callers=10 $binpath/$executable -nofork -debug -nolog");
+}
+
+sub screenvaldebug
+{
+	# Check to see its not 'running' already.
+	if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
+	
+	#Check we have gdb
+	checkvalgrind();
+	checkgdb();
+	checkscreen();
+	
+	# If we are still alive here.. Try starting the IRCd..
+	print "Starting InspIRCd in `screen`, type `screen -r` when the ircd crashes to view the valgrind and gdb output and get a backtrace.\n";
+	print "Once you're inside the screen session press ^C + d to re-detach from the session\n";
+	system("screen -m -d valgrind -v --tool=memcheck --leak-check=yes --db-attach=yes --num-callers=10 $binpath/$executable -nofork -debug -nolog");
+}
 
 sub stop {
         if (getstatus() == 0) { print "InspIRCd is not running. (Or PID File not found)\n"; return 0; }
@@ -102,7 +154,6 @@ sub stop {
         my $pid = getprocessid();
 	print "Stopping InspIRCd...\n";
         system("kill -TERM $pid >/dev/null 2>&1");
-	sleep 2;
 	if (getstatus() == 1)
 	{
 		print "InspIRCd not dying Quietly -- Forcing Kill\n";
@@ -199,3 +250,29 @@ sub getprocessid {
 	return $pid;
 }
 
+sub checkvalgrind
+{
+	unless(`valgrind --version`)
+	{
+		print "Couldn't start valgrind: $!\n";
+		exit;
+	}
+}
+
+sub checkgdb
+{
+	unless(`gdb --version`)
+	{
+		print "Couldn't start gdb: $!\n";
+		exit;
+	}
+}
+
+sub checkscreen
+{
+	unless(`screen --version`)
+	{
+		print "Couldn't start screen: $!\n";
+		exit;
+	}
+}