Kernel: Make ProcessTracer inherit from File.

cubiclove · Apr 28, 2019 · e886337 · e886337
1 parent 7ec1f6a
commit e886337
Show file tree

Hide file tree

Showing 12 changed files with 105 additions and 182 deletions.
diff --git a/Kernel/Devices/BXVGADevice.cpp b/Kernel/Devices/BXVGADevice.cpp
@@ -84,7 +84,7 @@ dword BXVGADevice::find_framebuffer_address()
  return framebuffer_address;
 }
 
-Region* BXVGADevice::mmap(Process& process, LinearAddress preferred_laddr, size_t offset, size_t size)
+KResultOr<Region*> BXVGADevice::mmap(Process& process, LinearAddress preferred_laddr, size_t offset, size_t size)
 {
  ASSERT(offset == 0);
  ASSERT(size == framebuffer_size_in_bytes());

diff --git a/Kernel/Devices/BXVGADevice.h b/Kernel/Devices/BXVGADevice.h
@@ -18,7 +18,7 @@ class BXVGADevice final : public BlockDevice {
  void set_y_offset(int);
 
  virtual int ioctl(Process&, unsigned request, unsigned arg) override;
- virtual Region* mmap(Process&, LinearAddress preferred_laddr, size_t offset, size_t) override;
+ virtual KResultOr<Region*> mmap(Process&, LinearAddress preferred_laddr, size_t offset, size_t) override;
 
  size_t framebuffer_size_in_bytes() const { return m_framebuffer_size.area() * sizeof(dword) * 2; }
  Size framebuffer_size() const { return m_framebuffer_size; }

diff --git a/Kernel/Devices/BlockDevice.h b/Kernel/Devices/BlockDevice.h
@@ -7,7 +7,7 @@ class BlockDevice : public Device {
 public:
  virtual ~BlockDevice() override;
 
- virtual Region* mmap(Process&, LinearAddress preferred_laddr, size_t offset, size_t size) = 0;
+ virtual bool is_seekable() const override { return true; }
 
 protected:
  BlockDevice(unsigned major, unsigned minor) : Device(major, minor) { }

diff --git a/Kernel/Devices/Device.cpp b/Kernel/Devices/Device.cpp
@@ -13,17 +13,7 @@ Device::~Device()
  VFS::the().unregister_device(*this);
 }
 
-KResultOr<Retained<FileDescriptor>> Device::open(int options)
+String Device::absolute_path() const
 {
- UNUSED_PARAM(options);
- return FileDescriptor::create(this);
-}
-
-void Device::close()
-{
-}
-
-int Device::ioctl(Process&, unsigned, unsigned)
-{
- return -ENOTTY;
+ return String::format("device:%u,%u (%s)", m_major, m_minor, class_name());
 }
diff --git a/Kernel/Devices/Device.h b/Kernel/Devices/Device.h
@@ -33,42 +33,21 @@
 // - Subclasses should take care to validate incoming addresses before dereferencing.
 //
 
-#include <AK/Retainable.h>
-#include <AK/Types.h>
-#include <Kernel/FileSystem/FileDescriptor.h>
+#include <Kernel/File.h>
 
-class Process;
-
-class Device : public Retainable<Device> {
+class Device : public File {
 public:
- virtual ~Device();
-
- InodeMetadata metadata() const { return { }; }
-
- virtual KResultOr<Retained<FileDescriptor>> open(int options);
- virtual void close();
-
- virtual bool can_read(Process&) const = 0;
- virtual bool can_write(Process&) const = 0;
-
- virtual ssize_t read(Process&, byte*, ssize_t) = 0;
- virtual ssize_t write(Process&, const byte*, ssize_t) = 0;
+ virtual ~Device() override;
 
  unsigned major() const { return m_major; }
  unsigned minor() const { return m_minor; }
 
- virtual bool is_tty() const { return false; }
- virtual bool is_master_pty() const { return false; }
-
- virtual int ioctl(Process&, unsigned request, unsigned arg);
-
- virtual const char* class_name() const = 0;
+ virtual String absolute_path() const override;
 
  uid_t uid() const { return m_uid; }
  uid_t gid() const { return m_gid; }
 
- virtual bool is_block_device() const { return false; }
- virtual bool is_character_device() const { return false; }
+ virtual bool is_device() const override { return true; }
 
 protected:
  Device(unsigned major, unsigned minor);

diff --git a/Kernel/File.h b/Kernel/File.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #include <AK/Retainable.h>
 #include <AK/Types.h>
 #include <Kernel/FileSystem/FileDescriptor.h>