Skip to content

Commit

Permalink
[LLDB] Insert names with same signo as alias instead of a new entry
Browse files Browse the repository at this point in the history 
Reviewers: clayborg, labath.
Subscribers: jaydeep, dsanders, bhushan, sagar, nitesh.jain, emaste,lldb-commits.
Differential Revision: http://reviews.llvm.org/D13646

llvm-svn: 250801
  • Loading branch information
@Mohit7
Mohit7 committed Oct 20, 2015
1 parent ea03901 commit 79be9e8
Show file tree
Hide file tree
Showing 6 changed files with 259 additions and 255 deletions.
13 changes: 8 additions & 5 deletions lldb/include/lldb/Target/UnixSignals.h
View file
Expand Up @@ -98,6 +98,9 @@ class UnixSignals
int32_t
GetSignalAtIndex(int32_t index) const;

ConstString
GetShortName(ConstString name) const;

// We assume that the elements of this object are constant once it is constructed,
// since a process should never need to add or remove symbols as it runs. So don't
// call these functions anywhere but the constructor of your subclass of UnixSignals or in
Expand All @@ -106,11 +109,11 @@ class UnixSignals
void
AddSignal (int signo,
const char *name,
const char *short_name,
bool default_suppress,
bool default_stop,
bool default_notify,
const char *description);
const char *description,
const char *alias = nullptr);

void
RemoveSignal (int signo);
Expand All @@ -123,18 +126,18 @@ class UnixSignals
struct Signal
{
ConstString m_name;
ConstString m_short_name;
ConstString m_alias;
std::string m_description;
bool m_suppress:1,
m_stop:1,
m_notify:1;

Signal (const char *name,
const char *short_name,
bool default_suppress,
bool default_stop,
bool default_notify,
const char *description);
const char *description,
const char *alias);

~Signal () {}
};
Expand Down
8 changes: 1 addition & 7 deletions lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
View file
Expand Up @@ -914,13 +914,8 @@ PlatformRemoteGDBServer::GetRemoteUnixSignals()
return false;

// We can live without short_name, description, etc.
std::string short_name{""};
auto object_sp = dict->GetValueForKey("short_name");
if (object_sp && object_sp->IsValid())
short_name = object_sp->GetStringValue();

bool suppress{false};
object_sp = dict->GetValueForKey("suppress");
auto object_sp = dict->GetValueForKey("suppress");
if (object_sp && object_sp->IsValid())
suppress = object_sp->GetBooleanValue();

Expand All @@ -941,7 +936,6 @@ PlatformRemoteGDBServer::GetRemoteUnixSignals()

remote_signals_sp->AddSignal(signo,
name.c_str(),
short_name.c_str(),
suppress, stop, notify,
description.c_str());
return true;
Expand Down
132 changes: 66 additions & 66 deletions lldb/source/Plugins/Process/Utility/FreeBSDSignals.cpp
View file
Expand Up @@ -26,70 +26,70 @@ FreeBSDSignals::Reset()
{
UnixSignals::Reset();

// SIGNO NAME SHORT NAME SUPPRESS STOP NOTIFY DESCRIPTION
// ====== ============ ========== ======== ====== ====== ===================================================
AddSignal (32, "SIGTHR", "THR", false, false, false, "thread interrupt");
AddSignal (33, "SIGLIBRT", "LIBRT", false, false, false, "reserved by real-time library");
AddSignal (65, "SIGRTMIN", "RTMIN", false, false, false, "real time signal 0");
AddSignal (66, "SIGRTMIN+1", "RTMIN+1", false, false, false, "real time signal 1");
AddSignal (67, "SIGRTMIN+2", "RTMIN+2", false, false, false, "real time signal 2");
AddSignal (68, "SIGRTMIN+3", "RTMIN+3", false, false, false, "real time signal 3");
AddSignal (69, "SIGRTMIN+4", "RTMIN+4", false, false, false, "real time signal 4");
AddSignal (70, "SIGRTMIN+5", "RTMIN+5", false, false, false, "real time signal 5");
AddSignal (71, "SIGRTMIN+6", "RTMIN+6", false, false, false, "real time signal 6");
AddSignal (72, "SIGRTMIN+7", "RTMIN+7", false, false, false, "real time signal 7");
AddSignal (73, "SIGRTMIN+8", "RTMIN+8", false, false, false, "real time signal 8");
AddSignal (74, "SIGRTMIN+9", "RTMIN+9", false, false, false, "real time signal 9");
AddSignal (75, "SIGRTMIN+10", "RTMIN+10", false, false, false, "real time signal 10");
AddSignal (76, "SIGRTMIN+11", "RTMIN+11", false, false, false, "real time signal 11");
AddSignal (77, "SIGRTMIN+12", "RTMIN+12", false, false, false, "real time signal 12");
AddSignal (78, "SIGRTMIN+13", "RTMIN+13", false, false, false, "real time signal 13");
AddSignal (79, "SIGRTMIN+14", "RTMIN+14", false, false, false, "real time signal 14");
AddSignal (80, "SIGRTMIN+15", "RTMIN+15", false, false, false, "real time signal 15");
AddSignal (81, "SIGRTMIN+16", "RTMIN+16", false, false, false, "real time signal 16");
AddSignal (82, "SIGRTMIN+17", "RTMIN+17", false, false, false, "real time signal 17");
AddSignal (83, "SIGRTMIN+18", "RTMIN+18", false, false, false, "real time signal 18");
AddSignal (84, "SIGRTMIN+19", "RTMIN+19", false, false, false, "real time signal 19");
AddSignal (85, "SIGRTMIN+20", "RTMIN+20", false, false, false, "real time signal 20");
AddSignal (86, "SIGRTMIN+21", "RTMIN+21", false, false, false, "real time signal 21");
AddSignal (87, "SIGRTMIN+22", "RTMIN+22", false, false, false, "real time signal 22");
AddSignal (88, "SIGRTMIN+23", "RTMIN+23", false, false, false, "real time signal 23");
AddSignal (89, "SIGRTMIN+24", "RTMIN+24", false, false, false, "real time signal 24");
AddSignal (90, "SIGRTMIN+25", "RTMIN+25", false, false, false, "real time signal 25");
AddSignal (91, "SIGRTMIN+26", "RTMIN+26", false, false, false, "real time signal 26");
AddSignal (92, "SIGRTMIN+27", "RTMIN+27", false, false, false, "real time signal 27");
AddSignal (93, "SIGRTMIN+28", "RTMIN+28", false, false, false, "real time signal 28");
AddSignal (94, "SIGRTMIN+29", "RTMIN+29", false, false, false, "real time signal 29");
AddSignal (95, "SIGRTMIN+30", "RTMIN+30", false, false, false, "real time signal 30");
AddSignal (96, "SIGRTMAX-30", "RTMAX-30", false, false, false, "real time signal 31");
AddSignal (97, "SIGRTMAX-29", "RTMAX-29", false, false, false, "real time signal 32");
AddSignal (98, "SIGRTMAX-28", "RTMAX-28", false, false, false, "real time signal 33");
AddSignal (99, "SIGRTMAX-27", "RTMAX-27", false, false, false, "real time signal 34");
AddSignal (100, "SIGRTMAX-26", "RTMAX-26", false, false, false, "real time signal 35");
AddSignal (101, "SIGRTMAX-25", "RTMAX-25", false, false, false, "real time signal 36");
AddSignal (102, "SIGRTMAX-24", "RTMAX-24", false, false, false, "real time signal 37");
AddSignal (103, "SIGRTMAX-23", "RTMAX-23", false, false, false, "real time signal 38");
AddSignal (104, "SIGRTMAX-22", "RTMAX-22", false, false, false, "real time signal 39");
AddSignal (105, "SIGRTMAX-21", "RTMAX-21", false, false, false, "real time signal 40");
AddSignal (106, "SIGRTMAX-20", "RTMAX-20", false, false, false, "real time signal 41");
AddSignal (107, "SIGRTMAX-19", "RTMAX-19", false, false, false, "real time signal 42");
AddSignal (108, "SIGRTMAX-18", "RTMAX-18", false, false, false, "real time signal 43");
AddSignal (109, "SIGRTMAX-17", "RTMAX-17", false, false, false, "real time signal 44");
AddSignal (110, "SIGRTMAX-16", "RTMAX-16", false, false, false, "real time signal 45");
AddSignal (111, "SIGRTMAX-15", "RTMAX-15", false, false, false, "real time signal 46");
AddSignal (112, "SIGRTMAX-14", "RTMAX-14", false, false, false, "real time signal 47");
AddSignal (113, "SIGRTMAX-13", "RTMAX-13", false, false, false, "real time signal 48");
AddSignal (114, "SIGRTMAX-12", "RTMAX-12", false, false, false, "real time signal 49");
AddSignal (115, "SIGRTMAX-11", "RTMAX-11", false, false, false, "real time signal 50");
AddSignal (116, "SIGRTMAX-10", "RTMAX-10", false, false, false, "real time signal 51");
AddSignal (117, "SIGRTMAX-9", "RTMAX-9", false, false, false, "real time signal 52");
AddSignal (118, "SIGRTMAX-8", "RTMAX-8", false, false, false, "real time signal 53");
AddSignal (119, "SIGRTMAX-7", "RTMAX-7", false, false, false, "real time signal 54");
AddSignal (120, "SIGRTMAX-6", "RTMAX-6", false, false, false, "real time signal 55");
AddSignal (121, "SIGRTMAX-5", "RTMAX-5", false, false, false, "real time signal 56");
AddSignal (122, "SIGRTMAX-4", "RTMAX-4", false, false, false, "real time signal 57");
AddSignal (123, "SIGRTMAX-3", "RTMAX-3", false, false, false, "real time signal 58");
AddSignal (124, "SIGRTMAX-2", "RTMAX-2", false, false, false, "real time signal 59");
AddSignal (125, "SIGRTMAX-1", "RTMAX-1", false, false, false, "real time signal 60");
AddSignal (126, "SIGRTMAX", "RTMAX", false, false, false, "real time signal 61");
// SIGNO NAME SUPPRESS STOP NOTIFY DESCRIPTION
// ====== ============ ======== ====== ====== ===================================================
AddSignal (32, "SIGTHR", false, false, false, "thread interrupt");
AddSignal (33, "SIGLIBRT", false, false, false, "reserved by real-time library");
AddSignal (65, "SIGRTMIN", false, false, false, "real time signal 0");
AddSignal (66, "SIGRTMIN+1", false, false, false, "real time signal 1");
AddSignal (67, "SIGRTMIN+2", false, false, false, "real time signal 2");
AddSignal (68, "SIGRTMIN+3", false, false, false, "real time signal 3");
AddSignal (69, "SIGRTMIN+4", false, false, false, "real time signal 4");
AddSignal (70, "SIGRTMIN+5", false, false, false, "real time signal 5");
AddSignal (71, "SIGRTMIN+6", false, false, false, "real time signal 6");
AddSignal (72, "SIGRTMIN+7", false, false, false, "real time signal 7");
AddSignal (73, "SIGRTMIN+8", false, false, false, "real time signal 8");
AddSignal (74, "SIGRTMIN+9", false, false, false, "real time signal 9");
AddSignal (75, "SIGRTMIN+10", false, false, false, "real time signal 10");
AddSignal (76, "SIGRTMIN+11", false, false, false, "real time signal 11");
AddSignal (77, "SIGRTMIN+12", false, false, false, "real time signal 12");
AddSignal (78, "SIGRTMIN+13", false, false, false, "real time signal 13");
AddSignal (79, "SIGRTMIN+14", false, false, false, "real time signal 14");
AddSignal (80, "SIGRTMIN+15", false, false, false, "real time signal 15");
AddSignal (81, "SIGRTMIN+16", false, false, false, "real time signal 16");
AddSignal (82, "SIGRTMIN+17", false, false, false, "real time signal 17");
AddSignal (83, "SIGRTMIN+18", false, false, false, "real time signal 18");
AddSignal (84, "SIGRTMIN+19", false, false, false, "real time signal 19");
AddSignal (85, "SIGRTMIN+20", false, false, false, "real time signal 20");
AddSignal (86, "SIGRTMIN+21", false, false, false, "real time signal 21");
AddSignal (87, "SIGRTMIN+22", false, false, false, "real time signal 22");
AddSignal (88, "SIGRTMIN+23", false, false, false, "real time signal 23");
AddSignal (89, "SIGRTMIN+24", false, false, false, "real time signal 24");
AddSignal (90, "SIGRTMIN+25", false, false, false, "real time signal 25");
AddSignal (91, "SIGRTMIN+26", false, false, false, "real time signal 26");
AddSignal (92, "SIGRTMIN+27", false, false, false, "real time signal 27");
AddSignal (93, "SIGRTMIN+28", false, false, false, "real time signal 28");
AddSignal (94, "SIGRTMIN+29", false, false, false, "real time signal 29");
AddSignal (95, "SIGRTMIN+30", false, false, false, "real time signal 30");
AddSignal (96, "SIGRTMAX-30", false, false, false, "real time signal 31");
AddSignal (97, "SIGRTMAX-29", false, false, false, "real time signal 32");
AddSignal (98, "SIGRTMAX-28", false, false, false, "real time signal 33");
AddSignal (99, "SIGRTMAX-27", false, false, false, "real time signal 34");
AddSignal (100, "SIGRTMAX-26", false, false, false, "real time signal 35");
AddSignal (101, "SIGRTMAX-25", false, false, false, "real time signal 36");
AddSignal (102, "SIGRTMAX-24", false, false, false, "real time signal 37");
AddSignal (103, "SIGRTMAX-23", false, false, false, "real time signal 38");
AddSignal (104, "SIGRTMAX-22", false, false, false, "real time signal 39");
AddSignal (105, "SIGRTMAX-21", false, false, false, "real time signal 40");
AddSignal (106, "SIGRTMAX-20", false, false, false, "real time signal 41");
AddSignal (107, "SIGRTMAX-19", false, false, false, "real time signal 42");
AddSignal (108, "SIGRTMAX-18", false, false, false, "real time signal 43");
AddSignal (109, "SIGRTMAX-17", false, false, false, "real time signal 44");
AddSignal (110, "SIGRTMAX-16", false, false, false, "real time signal 45");
AddSignal (111, "SIGRTMAX-15", false, false, false, "real time signal 46");
AddSignal (112, "SIGRTMAX-14", false, false, false, "real time signal 47");
AddSignal (113, "SIGRTMAX-13", false, false, false, "real time signal 48");
AddSignal (114, "SIGRTMAX-12", false, false, false, "real time signal 49");
AddSignal (115, "SIGRTMAX-11", false, false, false, "real time signal 50");
AddSignal (116, "SIGRTMAX-10", false, false, false, "real time signal 51");
AddSignal (117, "SIGRTMAX-9", false, false, false, "real time signal 52");
AddSignal (118, "SIGRTMAX-8", false, false, false, "real time signal 53");
AddSignal (119, "SIGRTMAX-7", false, false, false, "real time signal 54");
AddSignal (120, "SIGRTMAX-6", false, false, false, "real time signal 55");
AddSignal (121, "SIGRTMAX-5", false, false, false, "real time signal 56");
AddSignal (122, "SIGRTMAX-4", false, false, false, "real time signal 57");
AddSignal (123, "SIGRTMAX-3", false, false, false, "real time signal 58");
AddSignal (124, "SIGRTMAX-2", false, false, false, "real time signal 59");
AddSignal (125, "SIGRTMAX-1", false, false, false, "real time signal 60");
AddSignal (126, "SIGRTMAX", false, false, false, "real time signal 61");
}

0 comments on commit 79be9e8

Please sign in to comment.