Revert "[platform process list] add a flag for showing the processes of all users"

[wallace]

Summary

This reverts commit e4ac611cd787f3f0e727a394e96fb1a5c3b19ccb.

There's a failure according to http://lab.llvm.org:8080/green/view/LLDB/job/lldb-cmake/2538/testReport/junit/lldb-api/functionalities_gdb_remote_client/TestPlatformClient_py/

lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/TestPlatformClient.py

-import lldb
-import binascii
-import os
-from lldbsuite.test.lldbtest import *
-from lldbsuite.test.decorators import *
-from gdbclientutils import *
-
-
-class TestPlatformClient(GDBRemoteTestBase):
-
-    def test_process_list_with_all_users(self):
-        """Test connecting to a remote linux platform"""
-
-        class MyResponder(MockGDBServerResponder):
-            def qfProcessInfo(self, packet):
-                if "all_users:1" in packet:
-                    return "pid:10;ppid:1;uid:1;gid:1;euid:1;egid:1;name:" + binascii.hexlify("/a/test_process") + ";"
-                else:
-                    return "E04"
-
-        self.server.responder = MyResponder()
-
-        self.runCmd("platform select remote-linux")
-
-        try:
-            self.runCmd("platform connect connect://localhost:%d" %
-                        self.server.port)
-            self.assertTrue(self.dbg.GetSelectedPlatform().IsConnected())
-            self.expect("platform process list -x",
-                        substrs=["1 matching process was found", "test_process"])
-            self.expect("platform process list",
-                        error=True,
-                        substrs=["error: no processes were found on the \"remote-linux\" platform"])
-        finally:
-            self.dbg.GetSelectedPlatform().DisconnectRemote()

lldb/packages/Python/lldbsuite/test/functionalities/gdb_remote_client/gdbclientutils.py

def respond(self, packet):
             threadnum = int (packet[15:], 16)
             return self.threadStopInfo(threadnum)
         if packet == "QThreadSuffixSupported":
             return self.QThreadSuffixSupported()
         if packet == "QListThreadsInStopReply":
             return self.QListThreadsInStopReply()
         if packet.startswith("qMemoryRegionInfo:"):
             return self.qMemoryRegionInfo()
-        if packet == "qQueryGDBServer":
-            return self.qQueryGDBServer()
-        if packet == "qHostInfo":
-            return self.qHostInfo()
-        if packet == "qGetWorkingDir":
-            return self.qGetWorkingDir()
-        if packet == "qsProcessInfo":
-            return self.qsProcessInfo()
-        if packet.startswith("qfProcessInfo"):
-            return self.qfProcessInfo(packet)
 
         return self.other(packet)
 
-    def qsProcessInfo(self):
-        return "E04"
-
-    def qfProcessInfo(self, packet):
-        raise "E04"
-
-    def qGetWorkingDir(self):
-        return "2f"
-
-    def qHostInfo(self):
-        return "ptrsize:8;endian:little;"
-
-    def qQueryGDBServer(self):
-        return "E04"
-
     def interrupt(self):
         raise self.UnexpectedPacketException()
 
     def cont(self):
         raise self.UnexpectedPacketException()
 
     def vCont(self, packet):
         raise self.UnexpectedPacketException()
     
     def readRegisters(self):
         return "00000000" * self.registerCount
 
     def readRegister(self, register):
         return "00000000"
 
     def writeRegisters(self, registers_hex):
         return "OK"
def _handlePacket(self, packet):
             self._client.sendall(seven.bitcast_to_bytes(framed))
 
     PACKET_ACK = object()
     PACKET_INTERRUPT = object()
 
     class InvalidPacketException(Exception):
         pass
 
+
 class GDBRemoteTestBase(TestBase):
     """
     Base class for GDB client tests.
 
     This class will setup and start a mock GDB server for the test to use.
     It also provides assertPacketLogContains, which simplifies the checking
     of packets sent by the client.
     """

lldb/source/Commands/CommandObjectPlatform.cpp

Status SetOptionValue(uint32_t option_idx, llvm::StringRef option_arg,
       case 'A':
         show_args = true;
         break;
 
       case 'v':
         verbose = true;
         break;
 
-      case 'x':
-        match_info.SetMatchAllUsers(true);
-        break;
-
       default:
         llvm_unreachable("Unimplemented option");
       }
 
       return error;
     }
 
     void OptionParsingStarting(ExecutionContext *execution_context) override {

lldb/source/Commands/Options.td

def platform_process_list_egid : Option<"egid", "G">, GroupRange<2, 6>,
     Arg<"UnsignedInteger">, Validator<"&posix_validator">,
     Desc<"Find processes that have a matching effective group ID.">;
   def platform_process_list_arch : Option<"arch", "a">, GroupRange<2, 6>,
     Arg<"Architecture">,
     Desc<"Find processes that have a matching architecture.">;
   def platform_process_list_show_args : Option<"show-args", "A">,
     GroupRange<1, 6>,
     Desc<"Show process arguments instead of the process executable basename.">;
-  def platform_process_list_all_users: Option<"all-users", "x">,
-    GroupRange<1,6>,
-    Desc<"Show processes matching all user IDs.">;
   def platform_process_list_verbose : Option<"verbose", "v">, GroupRange<1, 6>,
     Desc<"Enable verbose output.">;
 }
 
 let Command = "platform process attach" in {
   def platform_process_attach_plugin : Option<"plugin", "P">, Arg<"Plugin">,
     Desc<"Name of the process plugin you want to use.">;
   def platform_process_attach_pid : Option<"pid", "p">, Group<1>, Arg<"Pid">,

lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp

if (!match_info.MatchAllProcesses()) {
       if (match_info.GetProcessInfo().GroupIDIsValid())
         packet.Printf("gid:%u;", match_info.GetProcessInfo().GetGroupID());
       if (match_info.GetProcessInfo().EffectiveUserIDIsValid())
         packet.Printf("euid:%u;",
                       match_info.GetProcessInfo().GetEffectiveUserID());
       if (match_info.GetProcessInfo().EffectiveGroupIDIsValid())
         packet.Printf("egid:%u;",
                       match_info.GetProcessInfo().GetEffectiveGroupID());
+      if (match_info.GetProcessInfo().EffectiveGroupIDIsValid())
         packet.Printf("all_users:%u;", match_info.GetMatchAllUsers() ? 1 : 0);
       if (match_info.GetProcessInfo().GetArchitecture().IsValid()) {
         const ArchSpec &match_arch =
             match_info.GetProcessInfo().GetArchitecture();
         const llvm::Triple &triple = match_arch.GetTriple();
         packet.PutCString("triple:");
         packet.PutCString(triple.getTriple());
         packet.PutChar(';');
       }