Remove ConnectionMachPort

[labath]

Summary

This class is unused, and since the StringRef refactor, it does not even
implement the Connection interface.

[clayborg]

Feel free to remote ConnectionSharedMemory as well in another change.

[clayborg]

remove ConnectionSharedMemory.cpp that is...

lldb/trunk/include/lldb/Core/ConnectionMachPort.h

-//===-- ConnectionMachPort.h --------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-#if defined(__APPLE__)
-
-#ifndef liblldb_ConnectionMachPort_h_
-#define liblldb_ConnectionMachPort_h_
-
-// C Includes
-#include <mach/kern_return.h>
-#include <mach/port.h>
-
-// C++ Includes
-#include <string>
-
-// Other libraries and framework includes
-// Project includes
-#include "lldb/Core/Connection.h"
-
-class ConnectionMachPort : public lldb_private::Connection {
-public:
-  ConnectionMachPort();
-
-  virtual ~ConnectionMachPort();
-
-  virtual bool IsConnected() const;
-
-  virtual lldb::ConnectionStatus BytesAvailable(uint32_t timeout_usec,
-                                                lldb_private::Error *error_ptr);
-
-  virtual lldb::ConnectionStatus Connect(const char *s,
-                                         lldb_private::Error *error_ptr);
-
-  virtual lldb::ConnectionStatus Disconnect(lldb_private::Error *error_ptr);
-
-  virtual size_t Read(void *dst, size_t dst_len, uint32_t timeout_usec,
-                      lldb::ConnectionStatus &status,
-                      lldb_private::Error *error_ptr);
-
-  virtual size_t Write(const void *src, size_t src_len,
-                       lldb::ConnectionStatus &status,
-                       lldb_private::Error *error_ptr);
-
-  virtual std::string GetURI();
-
-  lldb::ConnectionStatus BootstrapCheckIn(const char *port_name,
-                                          lldb_private::Error *error_ptr);
-
-  lldb::ConnectionStatus BootstrapLookup(const char *port_name,
-                                         lldb_private::Error *error_ptr);
-
-  struct PayloadType {
-    uint32_t command;
-    uint32_t data_length;
-    uint8_t data[32];
-  };
-
-  kern_return_t Send(const PayloadType &payload);
-
-  kern_return_t Receive(PayloadType &payload);
-
-protected:
-  mach_port_t m_task;
-  mach_port_t m_port;
-
-private:
-  std::string m_uri;
-
-  DISALLOW_COPY_AND_ASSIGN(ConnectionMachPort);
-};
-
-#endif // liblldb_ConnectionMachPort_h_
-
-#endif // #if defined(__APPLE__)

lldb/trunk/lldb.xcodeproj/project.pbxproj

/* Begin PBXBuildFile section */
     266942451A6DC2AC0063BE93 /* MIUtilString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 266941EE1A6DC2AC0063BE93 /* MIUtilString.cpp */; };
     2669424A1A6DC2AC0063BE93 /* MIUtilThreadBaseStd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 266941F81A6DC2AC0063BE93 /* MIUtilThreadBaseStd.cpp */; };
     2669424B1A6DC2AC0063BE93 /* MIUtilVariant.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 266941FA1A6DC2AC0063BE93 /* MIUtilVariant.cpp */; };
     2669424D1A6DC32B0063BE93 /* LLDB.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26680207115FD0ED008E1FE4 /* LLDB.framework */; };
     266DFE9713FD656E00D0C574 /* OperatingSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 266DFE9613FD656E00D0C574 /* OperatingSystem.cpp */; };
     266E82971B8CE3AC008FCA06 /* DWARFDIE.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 266E82961B8CE3AC008FCA06 /* DWARFDIE.cpp */; };
     266E829D1B8E542C008FCA06 /* DWARFAttribute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 266E829C1B8E542C008FCA06 /* DWARFAttribute.cpp */; };
     2670F8121862B44A006B332C /* libncurses.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2670F8111862B44A006B332C /* libncurses.dylib */; };
-    2671A0D013482601003A87BB /* ConnectionMachPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2671A0CF13482601003A87BB /* ConnectionMachPort.cpp */; };
     26744EF11338317700EF765A /* GDBRemoteCommunicationClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26744EED1338317700EF765A /* GDBRemoteCommunicationClient.cpp */; };
     26744EF31338317700EF765A /* GDBRemoteCommunicationServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26744EEF1338317700EF765A /* GDBRemoteCommunicationServer.cpp */; };
     26780C611867C33D00234593 /* libncurses.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2670F8111862B44A006B332C /* libncurses.dylib */; };
     267A47FB1B1411C40021A5BC /* NativeRegisterContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 267A47FA1B1411C40021A5BC /* NativeRegisterContext.cpp */; };
     267A47FF1B1411D90021A5BC /* NativeWatchpointList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 267A47FE1B1411D90021A5BC /* NativeWatchpointList.cpp */; };
     267A48011B1411E40021A5BC /* XML.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 267A48001B1411E40021A5BC /* XML.cpp */; };
     267C012B136880DF006E963E /* OptionGroupValueObjectDisplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 267C012A136880DF006E963E /* OptionGroupValueObjectDisplay.cpp */; };
     267C01371368C49C006E963E /* OptionGroupOutputFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26BCFC531368B3E4006DC050 /* OptionGroupOutputFile.cpp */; };
/* Begin PBXFileReference section */
     266DFE9613FD656E00D0C574 /* OperatingSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OperatingSystem.cpp; path = source/Target/OperatingSystem.cpp; sourceTree = "<group>"; };
     266DFE9813FD658300D0C574 /* OperatingSystem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OperatingSystem.h; path = include/lldb/Target/OperatingSystem.h; sourceTree = "<group>"; };
     266E82951B8CE346008FCA06 /* DWARFDIE.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DWARFDIE.h; sourceTree = "<group>"; };
     266E82961B8CE3AC008FCA06 /* DWARFDIE.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DWARFDIE.cpp; sourceTree = "<group>"; };
     266E829C1B8E542C008FCA06 /* DWARFAttribute.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DWARFAttribute.cpp; sourceTree = "<group>"; };
     266F5CBB12FC846200DFCE33 /* Config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Config.h; path = include/lldb/Host/Config.h; sourceTree = "<group>"; };
     26709E311964A34000B94724 /* LaunchServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LaunchServices.framework; path = /System/Library/Frameworks/CoreServices.framework/Frameworks/LaunchServices.framework; sourceTree = "<absolute>"; };
     2670F8111862B44A006B332C /* libncurses.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libncurses.dylib; path = /usr/lib/libncurses.dylib; sourceTree = "<absolute>"; };
-    2671A0CD134825F6003A87BB /* ConnectionMachPort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ConnectionMachPort.h; path = include/lldb/Core/ConnectionMachPort.h; sourceTree = "<group>"; };
-    2671A0CF13482601003A87BB /* ConnectionMachPort.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ConnectionMachPort.cpp; path = source/Core/ConnectionMachPort.cpp; sourceTree = "<group>"; };
     2672D8461189055500FF4019 /* CommandObjectFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CommandObjectFrame.cpp; path = source/Commands/CommandObjectFrame.cpp; sourceTree = "<group>"; };
     2672D8471189055500FF4019 /* CommandObjectFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommandObjectFrame.h; path = source/Commands/CommandObjectFrame.h; sourceTree = "<group>"; };
     26744EED1338317700EF765A /* GDBRemoteCommunicationClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GDBRemoteCommunicationClient.cpp; sourceTree = "<group>"; };
     26744EEE1338317700EF765A /* GDBRemoteCommunicationClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GDBRemoteCommunicationClient.h; sourceTree = "<group>"; };
     26744EEF1338317700EF765A /* GDBRemoteCommunicationServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GDBRemoteCommunicationServer.cpp; sourceTree = "<group>"; };
     26744EF01338317700EF765A /* GDBRemoteCommunicationServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GDBRemoteCommunicationServer.h; sourceTree = "<group>"; };
     2675F6FE1332BE690067997B /* PlatformRemoteiOS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformRemoteiOS.cpp; sourceTree = "<group>"; };
     2675F6FF1332BE690067997B /* PlatformRemoteiOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformRemoteiOS.h; sourceTree = "<group>"; };
26BC7C1010F1B34800F91463 /* Core */ = {
         26A0604811A5D03C00F75969 /* Baton.cpp */,
         26BC7D5410F1B77400F91463 /* Broadcaster.h */,
         26BC7E6D10F1B85900F91463 /* Broadcaster.cpp */,
         26BC7D5510F1B77400F91463 /* ClangForward.h */,
         26BC7D5610F1B77400F91463 /* Communication.h */,
         26BC7E6E10F1B85900F91463 /* Communication.cpp */,
         26BC7D5710F1B77400F91463 /* Connection.h */,
         26BC7E6F10F1B85900F91463 /* Connection.cpp */,
-        2671A0CD134825F6003A87BB /* ConnectionMachPort.h */,
-        2671A0CF13482601003A87BB /* ConnectionMachPort.cpp */,
         266603CC1345B5C0004DA8B6 /* ConnectionSharedMemory.h */,
         266603C91345B5A8004DA8B6 /* ConnectionSharedMemory.cpp */,
         26BC7D7C10F1B77400F91463 /* ConstString.h */,
         26BC7E9410F1B85900F91463 /* ConstString.cpp */,
         26BC7D5910F1B77400F91463 /* DataBuffer.h */,
         26BC7D5B10F1B77400F91463 /* DataBufferHeap.h */,
         26BC7E7210F1B85900F91463 /* DataBufferHeap.cpp */,
         26BC7D5C10F1B77400F91463 /* DataBufferMemoryMap.h */,
2689FFC613353D7A00698AC0 /* Sources */ = {
         264A97BF133918BC0017F0BE /* PlatformRemoteGDBServer.cpp in Sources */,
         EB8375E71B553DE800BA907D /* ThreadPlanCallFunctionUsingABI.cpp in Sources */,
         6D95DC011B9DC057000E318A /* HashedNameToDIE.cpp in Sources */,
         2697A54D133A6305004E4240 /* PlatformDarwin.cpp in Sources */,
         23D065911D4A7BEE0008EDE6 /* RenderScriptx86ABIFixups.cpp in Sources */,
         26651A18133BF9E0005B64B7 /* Opcode.cpp in Sources */,
         3FDFED0B19B7C8DE009756A7 /* HostThreadMacOSX.mm in Sources */,
         266603CA1345B5A8004DA8B6 /* ConnectionSharedMemory.cpp in Sources */,
-        2671A0D013482601003A87BB /* ConnectionMachPort.cpp in Sources */,
         4CABA9E0134A8BCD00539BDD /* ValueObjectMemory.cpp in Sources */,
         4CD0BD0F134BFADF00CB44D4 /* ValueObjectDynamicValue.cpp in Sources */,
         946216C21A97C080006E19CC /* OptionValueLanguage.cpp in Sources */,
         AF45FDE518A1F3AC0007051C /* AppleGetThreadItemInfoHandler.cpp in Sources */,
         2377C2F819E613C100737875 /* PipePosix.cpp in Sources */,
         23E2E5441D904913006F38BB /* MinidumpParser.cpp in Sources */,
         AF77E0931A033C7F0096C0EA /* ABISysV_ppc64.cpp in Sources */,
         26D5E15F135BAEA2006EA0A7 /* OptionGroupArchitecture.cpp in Sources */,

lldb/trunk/source/Core/CMakeLists.txt

 add_lldb_library(lldbCore
   Address.cpp
   AddressRange.cpp
   AddressResolver.cpp
   AddressResolverFileLine.cpp
   AddressResolverName.cpp
   ArchSpec.cpp
   Baton.cpp
   Broadcaster.cpp
   Communication.cpp
   Connection.cpp
-  ConnectionMachPort.cpp
   ConnectionSharedMemory.cpp
   ConstString.cpp
   DataBufferHeap.cpp
   DataBufferMemoryMap.cpp
   DataEncoder.cpp
   DataExtractor.cpp
   Debugger.cpp
   Disassembler.cpp

lldb/trunk/source/Core/ConnectionMachPort.cpp

-//===-- ConnectionMachPort.cpp ----------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-#if defined(__APPLE__)
-
-#include "lldb/Core/ConnectionMachPort.h"
-
-// C Includes
-#include <mach/mach.h>
-#include <servers/bootstrap.h>
-
-// C++ Includes
-// Other libraries and framework includes
-// Project includes
-#include "lldb/Core/Communication.h"
-#include "lldb/Core/Log.h"
-
-using namespace lldb;
-using namespace lldb_private;
-
-struct MessageType {
-  mach_msg_header_t head;
-  ConnectionMachPort::PayloadType payload;
-};
-
-ConnectionMachPort::ConnectionMachPort()
-    : Connection(), m_task(mach_task_self()), m_port(MACH_PORT_TYPE_NONE) {}
-
-ConnectionMachPort::~ConnectionMachPort() { Disconnect(NULL); }
-
-bool ConnectionMachPort::IsConnected() const {
-  return m_port != MACH_PORT_TYPE_NONE;
-}
-
-ConnectionStatus ConnectionMachPort::Connect(const char *s, Error *error_ptr) {
-  if (IsConnected()) {
-    if (error_ptr)
-      error_ptr->SetErrorString("already connected");
-    return eConnectionStatusError;
-  }
-
-  if (s == NULL || s[0] == '\0') {
-    if (error_ptr)
-      error_ptr->SetErrorString("empty connect URL");
-    return eConnectionStatusError;
-  }
-
-  ConnectionStatus status = eConnectionStatusError;
-
-  if (0 == strncmp(s, "bootstrap-checkin://", strlen("bootstrap-checkin://"))) {
-    s += strlen("bootstrap-checkin://");
-
-    if (*s) {
-      status = BootstrapCheckIn(s, error_ptr);
-    } else {
-      if (error_ptr)
-        error_ptr->SetErrorString("bootstrap port name is empty");
-    }
-  } else if (0 ==
-             strncmp(s, "bootstrap-lookup://", strlen("bootstrap-lookup://"))) {
-    s += strlen("bootstrap-lookup://");
-    if (*s) {
-      status = BootstrapLookup(s, error_ptr);
-    } else {
-      if (error_ptr)
-        error_ptr->SetErrorString("bootstrap port name is empty");
-    }
-  } else {
-    if (error_ptr)
-      error_ptr->SetErrorStringWithFormat("unsupported connection URL: '%s'",
-                                          s);
-  }
-
-  if (status == eConnectionStatusSuccess) {
-    if (error_ptr)
-      error_ptr->Clear();
-    m_uri.assign(s);
-  } else {
-    Disconnect(NULL);
-  }
-
-  return status;
-}
-
-ConnectionStatus ConnectionMachPort::BootstrapCheckIn(const char *port,
-                                                      Error *error_ptr) {
-  mach_port_t bootstrap_port = MACH_PORT_TYPE_NONE;
-
-  /* Getting bootstrap server port */
-  kern_return_t kret =
-      task_get_bootstrap_port(mach_task_self(), &bootstrap_port);
-  if (kret == KERN_SUCCESS) {
-    name_t port_name;
-    int len = snprintf(port_name, sizeof(port_name), "%s", port);
-    if (static_cast<size_t>(len) < sizeof(port_name)) {
-      kret = ::bootstrap_check_in(bootstrap_port, port_name, &m_port);
-    } else {
-      Disconnect(NULL);
-      if (error_ptr)
-        error_ptr->SetErrorString("bootstrap is too long");
-      return eConnectionStatusError;
-    }
-  }
-
-  if (kret != KERN_SUCCESS) {
-    Disconnect(NULL);
-    if (error_ptr)
-      error_ptr->SetError(kret, eErrorTypeMachKernel);
-    return eConnectionStatusError;
-  }
-  return eConnectionStatusSuccess;
-}
-
-lldb::ConnectionStatus ConnectionMachPort::BootstrapLookup(const char *port,
-                                                           Error *error_ptr) {
-  name_t port_name;
-
-  if (port && port[0]) {
-    if (static_cast<size_t>(::snprintf(port_name, sizeof(port_name), "%s",
-                                       port)) >= sizeof(port_name)) {
-      if (error_ptr)
-        error_ptr->SetErrorString("port netname is too long");
-      return eConnectionStatusError;
-    }
-  } else {
-    if (error_ptr)
-      error_ptr->SetErrorString("empty port netname");
-    return eConnectionStatusError;
-  }
-
-  mach_port_t bootstrap_port = MACH_PORT_TYPE_NONE;
-
-  /* Getting bootstrap server port */
-  kern_return_t kret =
-      task_get_bootstrap_port(mach_task_self(), &bootstrap_port);
-  if (kret == KERN_SUCCESS) {
-    kret = ::bootstrap_look_up(bootstrap_port, port_name, &m_port);
-  }
-
-  if (kret != KERN_SUCCESS) {
-    if (error_ptr)
-      error_ptr->SetError(kret, eErrorTypeMachKernel);
-    return eConnectionStatusError;
-  }
-
-  return eConnectionStatusSuccess;
-}
-
-ConnectionStatus ConnectionMachPort::Disconnect(Error *error_ptr) {
-  kern_return_t kret;
-
-  // TODO: verify if we need to netname_check_out for
-  // either or both
-  if (m_port != MACH_PORT_TYPE_NONE) {
-    kret = ::mach_port_deallocate(m_task, m_port);
-    if (error_ptr)
-      error_ptr->SetError(kret, eErrorTypeMachKernel);
-    m_port = MACH_PORT_TYPE_NONE;
-  }
-  m_uri.clear();
-
-  return eConnectionStatusSuccess;
-}
-
-size_t ConnectionMachPort::Read(void *dst, size_t dst_len,
-                                uint32_t timeout_usec, ConnectionStatus &status,
-                                Error *error_ptr) {
-  PayloadType payload;
-
-  kern_return_t kret = Receive(payload);
-  if (kret == KERN_SUCCESS) {
-    memcpy(dst, payload.data, payload.data_length);
-    status = eConnectionStatusSuccess;
-    return payload.data_length;
-  }
-
-  if (error_ptr)
-    error_ptr->SetError(kret, eErrorTypeMachKernel);
-  status = eConnectionStatusError;
-  return 0;
-}
-
-size_t ConnectionMachPort::Write(const void *src, size_t src_len,
-                                 ConnectionStatus &status, Error *error_ptr) {
-  PayloadType payload;
-  payload.command = 0;
-  payload.data_length = src_len;
-  const size_t max_payload_size = sizeof(payload.data);
-  if (src_len > max_payload_size)
-    payload.data_length = max_payload_size;
-  memcpy(payload.data, src, payload.data_length);
-
-  if (Send(payload) == KERN_SUCCESS) {
-    status = eConnectionStatusSuccess;
-    return payload.data_length;
-  }
-  status = eConnectionStatusError;
-  return 0;
-}
-
-std::string ConnectionMachPort::GetURI() { return m_uri; }
-
-ConnectionStatus ConnectionMachPort::BytesAvailable(uint32_t timeout_usec,
-                                                    Error *error_ptr) {
-  return eConnectionStatusLostConnection;
-}
-
-kern_return_t ConnectionMachPort::Send(const PayloadType &payload) {
-  struct MessageType message;
-
-  /* (i) Form the message : */
-
-  /* (i.a) Fill the header fields : */
-  message.head.msgh_bits = MACH_MSGH_BITS_REMOTE(MACH_MSG_TYPE_MAKE_SEND) |
-                           MACH_MSGH_BITS_OTHER(MACH_MSGH_BITS_COMPLEX);
-  message.head.msgh_size = sizeof(MessageType);
-  message.head.msgh_local_port = MACH_PORT_NULL;
-  message.head.msgh_remote_port = m_port;
-
-  /* (i.b) Explain the message type ( an integer ) */
-  //  message.type.msgt_name = MACH_MSG_TYPE_INTEGER_32;
-  //  message.type.msgt_size = 32;
-  //  message.type.msgt_number = 1;
-  //  message.type.msgt_inline = TRUE;
-  //  message.type.msgt_longform = FALSE;
-  //  message.type.msgt_deallocate = FALSE;
-  /* message.type.msgt_unused = 0; */ /* not needed, I think */
-
-  /* (i.c) Fill the message with the given integer : */
-  message.payload = payload;
-
-  /* (ii) Send the message : */
-  kern_return_t kret =
-      ::mach_msg(&message.head, MACH_SEND_MSG, message.head.msgh_size, 0,
-                 MACH_PORT_NULL, MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
-
-  return kret;
-}
-
-kern_return_t ConnectionMachPort::Receive(PayloadType &payload) {
-  MessageType message;
-  message.head.msgh_size = sizeof(MessageType);
-
-  kern_return_t kret =
-      ::mach_msg(&message.head, MACH_RCV_MSG, 0, sizeof(MessageType), m_port,
-                 MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
-
-  if (kret == KERN_SUCCESS)
-    payload = message.payload;
-
-  return kret;
-}
-
-#endif // #if defined(__APPLE__)