[haiku-commits] r39849 - in haiku/trunk: headers/os/kernel headers/private/debug headers/private/kernel src/apps/debugger src/apps/debugger/debugger_interface ...

  • From: anevilyak@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Tue, 14 Dec 2010 18:55:39 +0100 (CET)

Author: anevilyak
Date: 2010-12-14 18:55:38 +0100 (Tue, 14 Dec 2010)
New Revision: 39849
Changeset: http://dev.haiku-os.org/changeset/39849

Modified:
   haiku/trunk/headers/os/kernel/debugger.h
   haiku/trunk/headers/private/debug/DebugMessageHandler.h
   haiku/trunk/headers/private/kernel/user_debugger.h
   haiku/trunk/src/apps/debugger/TeamDebugger.cpp
   haiku/trunk/src/apps/debugger/TeamDebugger.h
   haiku/trunk/src/apps/debugger/debugger_interface/DebugEvent.cpp
   haiku/trunk/src/apps/debugger/debugger_interface/DebugEvent.h
   haiku/trunk/src/apps/debugger/debugger_interface/DebuggerInterface.cpp
   haiku/trunk/src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp
   haiku/trunk/src/system/kernel/debug/user_debugger.cpp
   haiku/trunk/src/system/kernel/thread.cpp
Log:
Revert r39846 and r39847.



Modified: haiku/trunk/headers/os/kernel/debugger.h
===================================================================
--- haiku/trunk/headers/os/kernel/debugger.h    2010-12-14 13:16:44 UTC (rev 
39848)
+++ haiku/trunk/headers/os/kernel/debugger.h    2010-12-14 17:55:38 UTC (rev 
39849)
@@ -180,8 +180,6 @@
        B_DEBUGGER_MESSAGE_TEAM_DELETED,                // the debugged team is 
gone
        B_DEBUGGER_MESSAGE_TEAM_EXEC,                   // the debugged team 
executes exec()
        B_DEBUGGER_MESSAGE_THREAD_CREATED,              // a thread has been 
created
-       B_DEBUGGER_MESSAGE_THREAD_RENAMED,              // a thread has been 
renamed
-       B_DEBUGGER_MESSAGE_THREAD_PRIORITY_CHANGED,     // a thread has had its 
priority altered
        B_DEBUGGER_MESSAGE_THREAD_DELETED,              // a thread has been 
deleted
        B_DEBUGGER_MESSAGE_IMAGE_CREATED,               // an image has been 
created
        B_DEBUGGER_MESSAGE_IMAGE_DELETED,               // an image has been 
deleted
@@ -547,25 +545,9 @@
 
 typedef struct {
        debug_origin    origin;                 // the thread that created the 
new thread
-       thread_id               new_thread;             // the newly created 
thread
+       team_id                 new_thread;             // the newly created 
thread
 } debug_thread_created;
 
-// B_DEBUGGER_MESSAGE_THREAD_RENAMED
-
-typedef struct {
-       debug_origin    origin;
-       thread_id               renamed_thread; // the thread whose name has 
changed
-       char                    name[B_OS_NAME_LENGTH];
-} debug_thread_renamed;
-
-// B_DEBUGGER_MESSAGE_THREAD_PRIORITY_CHANGED
-
-typedef struct {
-       debug_origin    origin;
-       thread_id               changed_thread; // the thread whose priority 
has changed
-       int32                   new_priority;   // the new priority
-} debug_thread_priority_changed;
-
 // B_DEBUGGER_MESSAGE_THREAD_DELETED
 
 typedef struct {
@@ -637,8 +619,6 @@
        debug_team_deleted                              team_deleted;
        debug_team_exec                                 team_exec;
        debug_thread_created                    thread_created;
-       debug_thread_renamed                    thread_renamed;
-       debug_thread_priority_changed   thread_priority_changed;
        debug_thread_deleted                    thread_deleted;
        debug_image_created                             image_created;
        debug_image_deleted                             image_deleted;

Modified: haiku/trunk/headers/private/debug/DebugMessageHandler.h
===================================================================
--- haiku/trunk/headers/private/debug/DebugMessageHandler.h     2010-12-14 
13:16:44 UTC (rev 39848)
+++ haiku/trunk/headers/private/debug/DebugMessageHandler.h     2010-12-14 
17:55:38 UTC (rev 39849)
@@ -42,11 +42,6 @@
                                                                        const 
debug_team_exec& message);
        virtual bool                            HandleThreadCreated(
                                                                        const 
debug_thread_created& message);
-       virtual bool                            HandleThreadRenamed(
-                                                                       const 
debug_thread_renamed& message);
-       virtual bool                            HandleThreadPriorityChanged(
-                                                                       const 
debug_thread_priority_changed&
-                                                                               
message);
        virtual bool                            HandleThreadDeleted(
                                                                        const 
debug_thread_deleted& message);
        virtual bool                            HandleImageCreated(

Modified: haiku/trunk/headers/private/kernel/user_debugger.h
===================================================================
--- haiku/trunk/headers/private/kernel/user_debugger.h  2010-12-14 13:16:44 UTC 
(rev 39848)
+++ haiku/trunk/headers/private/kernel/user_debugger.h  2010-12-14 17:55:38 UTC 
(rev 39849)
@@ -234,8 +234,6 @@
 void user_debug_team_exec();
 void user_debug_update_new_thread_flags(thread_id threadID);
 void user_debug_thread_created(thread_id threadID);
-void user_debug_thread_renamed(thread_id threadID, const char* name);
-void user_debug_thread_priority_changed(thread_id threadID, int32 priority);
 void user_debug_thread_deleted(team_id teamID, thread_id threadID);
 void user_debug_thread_exiting(struct thread* thread);
 void user_debug_image_created(const image_info *imageInfo);

Modified: haiku/trunk/src/apps/debugger/TeamDebugger.cpp
===================================================================
--- haiku/trunk/src/apps/debugger/TeamDebugger.cpp      2010-12-14 13:16:44 UTC 
(rev 39848)
+++ haiku/trunk/src/apps/debugger/TeamDebugger.cpp      2010-12-14 17:55:38 UTC 
(rev 39849)
@@ -884,25 +884,6 @@
                        handled = _HandleThreadCreated(threadEvent);
                        break;
                }
-               case B_DEBUGGER_MESSAGE_THREAD_RENAMED:
-               {
-                       ThreadRenamedEvent* threadEvent
-                               = dynamic_cast<ThreadRenamedEvent*>(event);
-                       TRACE_EVENTS("B_DEBUGGER_MESSAGE_THREAD_RENAMED: 
thread: %ld "
-                               "(\"%s\")\n",
-                               threadEvent->RenamedThread(), 
threadEvent->NewName());
-                       handled = _HandleThreadRenamed(threadEvent);
-                       break;
-               }
-               case B_DEBUGGER_MESSAGE_THREAD_PRIORITY_CHANGED:
-               {
-                       ThreadPriorityChangedEvent* threadEvent
-                               = 
dynamic_cast<ThreadPriorityChangedEvent*>(event);
-                       
TRACE_EVENTS("B_DEBUGGER_MESSAGE_THREAD_PRIORITY_CHANGED: thread:"
-                               " %ld\n", threadEvent->ChangedThread());
-                       handled = _HandleThreadPriorityChanged(threadEvent);
-                       break;
-               }
                case B_DEBUGGER_MESSAGE_THREAD_DELETED:
                        TRACE_EVENTS("B_DEBUGGER_MESSAGE_THREAD_DELETED: 
thread: %ld\n",
                                event->Thread());
@@ -973,29 +954,6 @@
 
 
 bool
-TeamDebugger::_HandleThreadRenamed(ThreadRenamedEvent* event)
-{
-       AutoLocker< ::Team> locker(fTeam);
-
-       ::Thread* thread = fTeam->ThreadByID(event->RenamedThread());
-
-       if (thread != NULL)
-               thread->SetName(event->NewName());
-
-       return false;
-}
-
-
-bool
-TeamDebugger::_HandleThreadPriorityChanged(ThreadPriorityChangedEvent*)
-{
-       // TODO: implement once we actually track thread priorities
-
-       return false;
-}
-
-
-bool
 TeamDebugger::_HandleThreadDeleted(ThreadDeletedEvent* event)
 {
        AutoLocker< ::Team> locker(fTeam);

Modified: haiku/trunk/src/apps/debugger/TeamDebugger.h
===================================================================
--- haiku/trunk/src/apps/debugger/TeamDebugger.h        2010-12-14 13:16:44 UTC 
(rev 39848)
+++ haiku/trunk/src/apps/debugger/TeamDebugger.h        2010-12-14 17:55:38 UTC 
(rev 39849)
@@ -95,10 +95,6 @@
 
                        bool                            _HandleThreadCreated(
                                                                        
ThreadCreatedEvent* event);
-                       bool                            _HandleThreadRenamed(
-                                                                       
ThreadRenamedEvent* event);
-                       bool                            
_HandleThreadPriorityChanged(
-                                                                       
ThreadPriorityChangedEvent* event);
                        bool                            _HandleThreadDeleted(
                                                                        
ThreadDeletedEvent* event);
                        bool                            _HandleImageCreated(

Modified: haiku/trunk/src/apps/debugger/debugger_interface/DebugEvent.cpp
===================================================================
--- haiku/trunk/src/apps/debugger/debugger_interface/DebugEvent.cpp     
2010-12-14 13:16:44 UTC (rev 39848)
+++ haiku/trunk/src/apps/debugger/debugger_interface/DebugEvent.cpp     
2010-12-14 17:55:38 UTC (rev 39849)
@@ -155,32 +155,6 @@
 }
 
 
-// #pragma mark - ThreadRenamedEvent
-
-
-ThreadRenamedEvent::ThreadRenamedEvent(team_id team, thread_id thread,
-       thread_id renamedThread, const char* newName)
-       :
-       DebugEvent(B_DEBUGGER_MESSAGE_THREAD_RENAMED, team, thread),
-       fRenamedThread(renamedThread)
-{
-       strlcpy(fName, newName, sizeof(fName));
-}
-
-
-// #pragma mark - ThreadPriorityChangedEvent
-
-
-ThreadPriorityChangedEvent::ThreadPriorityChangedEvent(team_id team,
-       thread_id thread, thread_id changedThread, int32 newPriority)
-       :
-       DebugEvent(B_DEBUGGER_MESSAGE_THREAD_PRIORITY_CHANGED, team, thread),
-       fChangedThread(changedThread),
-       fNewPriority(newPriority)
-{
-}
-
-
 // #pragma mark - ThreadDeletedEvent
 
 

Modified: haiku/trunk/src/apps/debugger/debugger_interface/DebugEvent.h
===================================================================
--- haiku/trunk/src/apps/debugger/debugger_interface/DebugEvent.h       
2010-12-14 13:16:44 UTC (rev 39848)
+++ haiku/trunk/src/apps/debugger/debugger_interface/DebugEvent.h       
2010-12-14 17:55:38 UTC (rev 39849)
@@ -127,36 +127,6 @@
 };
 
 
-class ThreadRenamedEvent : public DebugEvent {
-public:
-                                                               
ThreadRenamedEvent(team_id team,
-                                                                       
thread_id thread, thread_id renamedThread,
-                                                                       const 
char* name);
-
-                       thread_id                       RenamedThread() const { 
return fRenamedThread; }
-                       const char*                     NewName() const { 
return fName; }
-
-private:
-                       thread_id                       fRenamedThread;
-                       char                            fName[B_OS_NAME_LENGTH];
-};
-
-
-class ThreadPriorityChangedEvent : public DebugEvent {
-public:
-                                                               
ThreadPriorityChangedEvent(team_id team,
-                                                                       
thread_id thread, thread_id changedThread,
-                                                                       int32 
newPriority);
-
-                       thread_id                       ChangedThread() const { 
return fChangedThread; }
-                       int32                           NewPriority() const     
{ return fNewPriority; }
-
-private:
-                       thread_id                       fChangedThread;
-                       int32                           fNewPriority;
-};
-
-
 class ThreadDeletedEvent : public DebugEvent {
 public:
                                                                
ThreadDeletedEvent(team_id team,

Modified: haiku/trunk/src/apps/debugger/debugger_interface/DebuggerInterface.cpp
===================================================================
--- haiku/trunk/src/apps/debugger/debugger_interface/DebuggerInterface.cpp      
2010-12-14 13:16:44 UTC (rev 39848)
+++ haiku/trunk/src/apps/debugger/debugger_interface/DebuggerInterface.cpp      
2010-12-14 17:55:38 UTC (rev 39849)
@@ -670,17 +670,6 @@
                        event = new(std::nothrow) 
ThreadCreatedEvent(message.origin.team,
                                message.origin.thread, 
message.thread_created.new_thread);
                        break;
-               case B_DEBUGGER_MESSAGE_THREAD_RENAMED:
-                       event = new(std::nothrow) 
ThreadRenamedEvent(message.origin.team,
-                               message.origin.thread, 
message.thread_renamed.renamed_thread,
-                               message.thread_renamed.name);
-                       break;
-               case B_DEBUGGER_MESSAGE_THREAD_PRIORITY_CHANGED:
-                       event = new(std::nothrow) ThreadPriorityChangedEvent(
-                               message.origin.team, message.origin.thread,
-                               message.thread_priority_changed.changed_thread,
-                               message.thread_priority_changed.new_priority);
-                       break;
                case B_DEBUGGER_MESSAGE_THREAD_DELETED:
                        event = new(std::nothrow) 
ThreadDeletedEvent(message.origin.team,
                                message.origin.thread);

Modified: 
haiku/trunk/src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp
===================================================================
--- haiku/trunk/src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp 
2010-12-14 13:16:44 UTC (rev 39848)
+++ haiku/trunk/src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp 
2010-12-14 17:55:38 UTC (rev 39849)
@@ -168,10 +168,6 @@
                                        && message->FindInt32("modifiers", 
(int32*)&modifiers)
                                        == B_OK) {
                                        switch (key) {
-                                               case B_F5_KEY:
-                                                       
fListener->ThreadActionRequested(
-                                                               
fActiveThread->ID(), MSG_THREAD_RUN);
-                                                       break;
                                                case B_F10_KEY:
                                                        
fListener->ThreadActionRequested(
                                                                
fActiveThread->ID(), MSG_THREAD_STEP_OVER);

Modified: haiku/trunk/src/system/kernel/debug/user_debugger.cpp
===================================================================
--- haiku/trunk/src/system/kernel/debug/user_debugger.cpp       2010-12-14 
13:16:44 UTC (rev 39848)
+++ haiku/trunk/src/system/kernel/debug/user_debugger.cpp       2010-12-14 
17:55:38 UTC (rev 39849)
@@ -1078,48 +1078,6 @@
 
 
 void
-user_debug_thread_renamed(thread_id threadID, const char *name)
-{
-       // check, if a debugger is installed and is interested in thread events
-       struct thread *thread = thread_get_current_thread();
-       int32 teamDebugFlags = atomic_get(&thread->team->debug_info.flags);
-       if (~teamDebugFlags
-               & (B_TEAM_DEBUG_DEBUGGER_INSTALLED | B_TEAM_DEBUG_THREADS)) {
-               return;
-       }
-
-       // prepare the message
-       debug_thread_renamed message;
-       message.renamed_thread = threadID;
-       strlcpy(message.name, name, sizeof(message.name));
-
-       thread_hit_debug_event(B_DEBUGGER_MESSAGE_THREAD_RENAMED, &message,
-               sizeof(message), true);
-}
-
-
-void
-user_debug_thread_priority_changed(thread_id threadID, int32 priority)
-{
-       // check, if a debugger is installed and is interested in thread events
-       struct thread *thread = thread_get_current_thread();
-       int32 teamDebugFlags = atomic_get(&thread->team->debug_info.flags);
-       if (~teamDebugFlags
-               & (B_TEAM_DEBUG_DEBUGGER_INSTALLED | B_TEAM_DEBUG_THREADS)) {
-               return;
-       }
-
-       // prepare the message
-       debug_thread_priority_changed message;
-       message.changed_thread = threadID;
-       message.new_priority = priority;
-
-       thread_hit_debug_event(B_DEBUGGER_MESSAGE_THREAD_PRIORITY_CHANGED, 
&message,
-               sizeof(message), true);
-}
-
-
-void
 user_debug_thread_deleted(team_id teamID, thread_id threadID)
 {
        // Things are a bit complicated here, since this thread no longer 
belongs to

Modified: haiku/trunk/src/system/kernel/thread.cpp
===================================================================
--- haiku/trunk/src/system/kernel/thread.cpp    2010-12-14 13:16:44 UTC (rev 
39848)
+++ haiku/trunk/src/system/kernel/thread.cpp    2010-12-14 17:55:38 UTC (rev 
39849)
@@ -2559,9 +2559,6 @@
        RELEASE_THREAD_LOCK();
        restore_interrupts(state);
 
-       if (status == B_OK)
-               user_debug_thread_renamed(id, name);
-
        return status;
 }
 
@@ -2604,8 +2601,6 @@
                scheduler_set_thread_priority(thread, priority);
        }
 
-       user_debug_thread_priority_changed(id, priority);
-
        return oldPriority;
 }
 


Other related posts:

  • » [haiku-commits] r39849 - in haiku/trunk: headers/os/kernel headers/private/debug headers/private/kernel src/apps/debugger src/apps/debugger/debugger_interface ... - anevilyak