Fix several problems reported by valgrind

[gldbg.git] / source / gldbg.cpp

diff --git a/source/gldbg.cpp b/source/gldbg.cpp
index a7abf31e08ed848f205dbcc468d4b81706fd19c3..c13d5cc2fa6bbafb1b42c87b38139cf78fd58c10 100644 (file)
--- a/source/gldbg.cpp
+++ b/source/gldbg.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of gldbg
-Copyright © 2009-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the GPL
-*/
-
 #include <algorithm>
 #include <stdexcept>
 #include <cstdlib>
@@ -27,8 +20,10 @@ using namespace std;
 GlDbg *GlDbg::instance = 0;
 
 GlDbg::GlDbg(int argc, char **argv):
+       done(false),
        cmd_interp(*this),
        process(vector<string>(argv+1, argv+argc)),
+       sock_fd(-1),
        buf_offset(0),
        flushing(false),
        got_sigchld(false),
@@ -63,7 +58,7 @@ int GlDbg::main()
        printf("Copyright © 2009-2010 Mikkosoft Productions\n");
        printf("Type \"help\" for a list of commands\n");
 
-       while(1)
+       while(!done)
                tick();
 
        return 0;
@@ -86,13 +81,28 @@ void GlDbg::launch()
        process.launch();
        close(fds[1]);
 
-       breakpoints.clear();
+       for(BreakList::iterator i=breakpoints.begin(); i!=breakpoints.end(); )
+       {
+               if(i->has_owner(0))
+               {
+                       i->owners.clear();
+                       i->owners.push_back(0);
+                       send_breakpoint(i->function, i->flag, 0);
+                       ++i;
+               }
+               else
+                       breakpoints.erase(i++);
+       }
+
        for(ToolList::iterator i=tools.begin(); i!=tools.end(); ++i)
                (*i)->process_started();
 }
 
 void GlDbg::send(GlPacket *pkt)
 {
+       if(process.get_state()==Process::INACTIVE)
+               throw runtime_error("Program is not running");
+
        packet_send(pkt, sock_fd);
 }
 
@@ -102,6 +112,15 @@ void GlDbg::hold()
        send(pkt);
 }
 
+void GlDbg::send_breakpoint(unsigned short func, unsigned char set_flags, unsigned char clear_flags)
+{
+       GlPacket *pkt = packet_begin(FUNC_GLDBREAK);
+       packet_write_short(pkt, func);
+       packet_write_char(pkt, set_flags);
+       packet_write_char(pkt, clear_flags);
+       send(pkt);
+}
+
 void GlDbg::set_breakpoint(unsigned short func, unsigned char flag, Tool *owner)
 {
        Breakpoint *bp = (func ? get_breakpoint(func, flag) : 0);
@@ -115,11 +134,8 @@ void GlDbg::set_breakpoint(unsigned short func, unsigned char flag, Tool *owner)
                        breakpoints.back().add_owner(owner);
                }
 
-               GlPacket *pkt = packet_begin(FUNC_GLDBREAK);
-               packet_write_short(pkt, func);
-               packet_write_char(pkt, flag);
-               packet_write_char(pkt, 0);
-               send(pkt);
+               if(process.get_state()>=Process::RUNNING)
+                       send_breakpoint(func, flag, 0);
        }
 }
 
@@ -142,11 +158,8 @@ void GlDbg::clear_breakpoint(unsigned short func, unsigned char flag, Tool *owne
                                        break;
                                }
 
-                       GlPacket *pkt = packet_begin(FUNC_GLDBREAK);
-                       packet_write_short(pkt, func);
-                       packet_write_char(pkt, 0);
-                       packet_write_char(pkt, flag);
-                       send(pkt);
+                       if(process.get_state()>=Process::RUNNING)
+                               send_breakpoint(func, 0, flag);
                }
        }
 }
@@ -168,7 +181,7 @@ void GlDbg::quit(bool force)
 {
        if(!force && process.get_state()!=Process::INACTIVE)
                throw runtime_error("Program is still running");
-       exit(0);
+       done = true;
 }
 
 void GlDbg::tick()
@@ -214,7 +227,7 @@ void GlDbg::tick()
                        free(line);
                }
                else if(pstate==Process::INACTIVE)
-                       exit(0);
+                       done = true;
        }
 }