Move linux/process files to util/process

A step towards making these files usable by non-Linux systems. Bug: crashpad:196 Change-Id: I71323b29e46208b3992055722e4622d79409c44c Reviewed-on: https://chromium-review.googlesource.com/685406 Commit-Queue: Dave Bort <dbort@google.com> Reviewed-by: Mark Mentovai <mark@chromium.org>
2024-12-27 15:32:10 +08:00 · 2017-09-26 12:52:41 -07:00 · 2017-09-26 12:52:41 -07:00 · fe4b16fe88
commit fe4b16fe88
parent 1abaf22e28
15 changed files with 36 additions and 26 deletions
--- a/snapshot/elf/elf_dynamic_array_reader.h
+++ b/snapshot/elf/elf_dynamic_array_reader.h
@ -21,9 +21,9 @@

 #include "base/logging.h"
 #include "base/macros.h"
-#include "util/linux/process_memory_range.h"
 #include "util/misc/address_types.h"
 #include "util/misc/reinterpret_bytes.h"
+#include "util/process/process_memory_range.h"

 namespace crashpad {

--- a/snapshot/elf/elf_image_reader.h
+++ b/snapshot/elf/elf_image_reader.h
@ -24,10 +24,10 @@
 #include "base/macros.h"
 #include "snapshot/elf/elf_dynamic_array_reader.h"
 #include "snapshot/elf/elf_symbol_table_reader.h"
-#include "util/linux/process_memory_range.h"
 #include "util/misc/address_types.h"
 #include "util/misc/initialization_state.h"
 #include "util/misc/initialization_state_dcheck.h"
+#include "util/process/process_memory_range.h"

 namespace crashpad {

--- a/snapshot/elf/elf_symbol_table_reader.h
+++ b/snapshot/elf/elf_symbol_table_reader.h
@ -20,8 +20,8 @@
 #include <string>

 #include "base/macros.h"
-#include "util/linux/process_memory_range.h"
 #include "util/misc/address_types.h"
+#include "util/process/process_memory_range.h"

 namespace crashpad {

--- a/snapshot/linux/debug_rendezvous.h
+++ b/snapshot/linux/debug_rendezvous.h
@ -20,8 +20,8 @@

 #include "base/macros.h"
 #include "util/linux/address_types.h"
-#include "util/linux/process_memory_range.h"
 #include "util/misc/initialization_state_dcheck.h"
+#include "util/process/process_memory_range.h"

 namespace crashpad {

--- a/snapshot/linux/debug_rendezvous_test.cc
+++ b/snapshot/linux/debug_rendezvous_test.cc
@ -31,8 +31,8 @@
 #include "util/linux/address_types.h"
 #include "util/linux/auxiliary_vector.h"
 #include "util/linux/memory_map.h"
-#include "util/linux/process_memory.h"
-#include "util/linux/process_memory_range.h"
+#include "util/process/process_memory.h"
+#include "util/process/process_memory_range.h"

 #if defined(OS_ANDROID)
 #include <sys/system_properties.h>
--- a/snapshot/linux/process_reader.h
+++ b/snapshot/linux/process_reader.h
@ -24,11 +24,11 @@
 #include "base/macros.h"
 #include "util/linux/address_types.h"
 #include "util/linux/memory_map.h"
-#include "util/linux/process_memory.h"
 #include "util/linux/ptrace_connection.h"
 #include "util/linux/thread_info.h"
-#include "util/posix/process_info.h"
 #include "util/misc/initialization_state_dcheck.h"
+#include "util/posix/process_info.h"
+#include "util/process/process_memory.h"

 namespace crashpad {

--- a/util/linux/auxiliary_vector_test.cc
+++ b/util/linux/auxiliary_vector_test.cc
@ -26,9 +26,9 @@
 #include "test/multiprocess.h"
 #include "util/linux/address_types.h"
 #include "util/linux/memory_map.h"
-#include "util/linux/process_memory.h"
 #include "util/misc/from_pointer_cast.h"
 #include "util/numeric/int128.h"
+#include "util/process/process_memory.h"

 extern "C" {
 extern void _start();
--- a/util/process/process_memory.cc
+++ b/util/process/process_memory.cc
@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "util/linux/process_memory.h"
+#include "util/process/process_memory.h"

 #include <fcntl.h>
 #include <stdio.h>
--- a/util/process/process_memory.h
+++ b/util/process/process_memory.h
@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#ifndef CRASHPAD_UTIL_LINUX_PROCESS_MEMORY_H_
-#define CRASHPAD_UTIL_LINUX_PROCESS_MEMORY_H_
+#ifndef CRASHPAD_UTIL_PROCESS_PROCESS_MEMORY_H_
+#define CRASHPAD_UTIL_PROCESS_PROCESS_MEMORY_H_

 #include <sys/types.h>

@ -102,4 +102,4 @@ class ProcessMemory {

 }  // namespace crashpad

-#endif  // CRASHPAD_UTIL_LINUX_PROCESS_MEMORY_H_
+#endif  // CRASHPAD_UTIL_PROCESS_PROCESS_MEMORY_H_
--- a/util/process/process_memory_range.cc
+++ b/util/process/process_memory_range.cc
@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "util/linux/process_memory_range.h"
+#include "util/process/process_memory_range.h"

 #include <algorithm>
 #include <limits>
--- a/util/process/process_memory_range.h
+++ b/util/process/process_memory_range.h
@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#ifndef CRASHPAD_UTIL_LINUX_PROCESS_MEMORY_RANGE_H_
-#define CRASHPAD_UTIL_LINUX_PROCESS_MEMORY_RANGE_H_
+#ifndef CRASHPAD_UTIL_PROCESS_PROCESS_MEMORY_RANGE_H_
+#define CRASHPAD_UTIL_PROCESS_PROCESS_MEMORY_RANGE_H_

 #include <sys/types.h>

@ -22,8 +22,8 @@
 #include "base/macros.h"
 #include "util/linux/address_types.h"
 #include "util/linux/checked_linux_address_range.h"
-#include "util/linux/process_memory.h"
 #include "util/misc/initialization_state_dcheck.h"
+#include "util/process/process_memory.h"

 namespace crashpad {

@ -126,4 +126,4 @@ class ProcessMemoryRange {

 }  // namespace crashpad

-#endif  // CRASHPAD_UTIL_LINUX_PROCESS_MEMORY_RANGE_H_
+#endif  // CRASHPAD_UTIL_PROCESS_PROCESS_MEMORY_RANGE_H_
--- a/util/process/process_memory_range_test.cc
+++ b/util/process/process_memory_range_test.cc
@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "util/linux/process_memory_range.h"
+#include "util/process/process_memory_range.h"

 #include <unistd.h>

--- a/util/process/process_memory_test.cc
+++ b/util/process/process_memory_test.cc
@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "util/linux/process_memory.h"
+#include "util/process/process_memory.h"

 #include <string.h>
 #include <sys/mman.h>
--- a/util/util.gyp
+++ b/util/util.gyp
@ -54,10 +54,6 @@
        'linux/memory_map.h',
        'linux/proc_stat_reader.cc',
        'linux/proc_stat_reader.h',
-        'linux/process_memory.cc',
-        'linux/process_memory.h',
-        'linux/process_memory_range.cc',
-        'linux/process_memory_range.h',
        'linux/ptrace_connection.h',
        'linux/ptracer.cc',
        'linux/ptracer.h',
@ -181,6 +177,10 @@
        'posix/signals.h',
        'posix/symbolic_constants_posix.cc',
        'posix/symbolic_constants_posix.h',
+        'process/process_memory.h',
+        'process/process_memory.cc',
+        'process/process_memory_range.cc',
+        'process/process_memory_range.h',
        'stdlib/aligned_allocator.cc',
        'stdlib/aligned_allocator.h',
        'stdlib/cxx.h',
@ -361,6 +361,11 @@
            'net/http_transport_libcurl.cc',
          ],
        }],
+        ['OS!="linux" and OS!="android"', {
+          'sources/': [
+            ['exclude', '^process/'],
+          ],
+        }],
      ],
      'target_conditions': [
        ['OS=="android"', {
--- a/util/util_test.gyp
+++ b/util/util_test.gyp
@ -42,8 +42,6 @@
        'linux/auxiliary_vector_test.cc',
        'linux/memory_map_test.cc',
        'linux/proc_stat_reader_test.cc',
-        'linux/process_memory_range_test.cc',
-        'linux/process_memory_test.cc',
        'linux/ptracer_test.cc',
        'linux/scoped_ptrace_attach_test.cc',
        'mac/launchd_test.mm',
@ -90,6 +88,8 @@
        'posix/scoped_mmap_test.cc',
        'posix/signals_test.cc',
        'posix/symbolic_constants_posix_test.cc',
+        'process/process_memory_range_test.cc',
+        'process/process_memory_test.cc',
        'stdlib/aligned_allocator_test.cc',
        'stdlib/map_insert_test.cc',
        'stdlib/string_number_conversion_test.cc',
@ -143,6 +143,11 @@
            ['exclude', '^net/http_transport_test\\.cc$'],
          ]
        }],
+        ['OS!="linux" and OS!="android"', {
+          'sources/': [
+            ['exclude', '^process/'],
+          ],
+        }],
      ],
      'target_conditions': [
        ['OS=="android"', {