Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Side by Side Diff: disk-manager.cc

Issue 6824082: Populate disk information from udev to disk manager. (Closed) Base URL: ssh://gitrw.chromium.org:9222/cros-disks.git@master
Patch Set: Fixed issues after code review Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | udev-device.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium OS Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "disk-manager.h" 5 #include "disk-manager.h"
6
7 #include "disk.h" 6 #include "disk.h"
7 #include "udev-device.h"
8 8
9 #include <base/logging.h> 9 #include <base/logging.h>
10 #include <libudev.h> 10 #include <libudev.h>
11 #include <vector> 11 #include <vector>
12 12
13 13
14 namespace cros_disks { 14 namespace cros_disks {
15 15
16 DiskManager::DiskManager() 16 DiskManager::DiskManager()
17 : udev_(udev_new()), 17 : udev_(udev_new()),
18 udev_monitor_fd_(0) { 18 udev_monitor_fd_(0) {
19 19
20 CHECK(udev_) << "Failed to initialize udev"; 20 CHECK(udev_) << "Failed to initialize udev";
21 udev_monitor_ = udev_monitor_new_from_netlink(udev_, "udev"); 21 udev_monitor_ = udev_monitor_new_from_netlink(udev_, "udev");
22 udev_monitor_filter_add_match_subsystem_devtype(udev_monitor_, "block", NULL); 22 udev_monitor_filter_add_match_subsystem_devtype(udev_monitor_, "block", NULL);
23 udev_monitor_enable_receiving(udev_monitor_); 23 udev_monitor_enable_receiving(udev_monitor_);
24 udev_monitor_fd_ = udev_monitor_get_fd(udev_monitor_); 24 udev_monitor_fd_ = udev_monitor_get_fd(udev_monitor_);
25 } 25 }
26 26
27 DiskManager::~DiskManager() { 27 DiskManager::~DiskManager() {
28 udev_monitor_unref(udev_monitor_); 28 udev_monitor_unref(udev_monitor_);
29 udev_unref(udev_); 29 udev_unref(udev_);
30 } 30 }
31 31
32 std::vector<Disk> DiskManager::EnumerateDisks() { 32 std::vector<Disk> DiskManager::EnumerateDisks() {
33 //TODO(rtc): implement this...
34 std::vector<Disk> disks; 33 std::vector<Disk> disks;
34
35 struct udev_enumerate *enumerate = udev_enumerate_new(udev_);
36 udev_enumerate_add_match_subsystem(enumerate, "block");
37 udev_enumerate_scan_devices(enumerate);
38
39 struct udev_list_entry *device_list, *device_list_entry;
40 device_list = udev_enumerate_get_list_entry(enumerate);
41 udev_list_entry_foreach(device_list_entry, device_list) {
42 const char *path = udev_list_entry_get_name(device_list_entry);
43 udev_device *dev = udev_device_new_from_syspath(udev_, path);
44
45 LOG(INFO) << "Device";
46 LOG(INFO) << " Node: " << udev_device_get_devnode(dev);
47 LOG(INFO) << " Subsystem: " << udev_device_get_subsystem(dev);
48 LOG(INFO) << " Devtype: " << udev_device_get_devtype(dev);
49 LOG(INFO) << " Devpath: " << udev_device_get_devpath(dev);
50 LOG(INFO) << " Sysname: " << udev_device_get_sysname(dev);
51 LOG(INFO) << " Syspath: " << udev_device_get_syspath(dev);
52 LOG(INFO) << " Properties: ";
53 struct udev_list_entry *property_list, *property_list_entry;
54 property_list = udev_device_get_properties_list_entry(dev);
55 udev_list_entry_foreach (property_list_entry, property_list) {
56 const char *key = udev_list_entry_get_name(property_list_entry);
57 const char *value = udev_list_entry_get_value(property_list_entry);
58 LOG(INFO) << " " << key << " = " << value;
59 }
60
61 disks.push_back(UdevDevice(dev).ToDisk());
62 udev_device_unref(dev);
63 }
64
65 udev_enumerate_unref(enumerate);
66
35 return disks; 67 return disks;
36 } 68 }
37 69
38 bool DiskManager::ProcessUdevChanges() { 70 bool DiskManager::ProcessUdevChanges() {
39 struct udev_device *dev = udev_monitor_receive_device(udev_monitor_); 71 struct udev_device *dev = udev_monitor_receive_device(udev_monitor_);
40 CHECK(dev) << "Unknown udev device"; 72 CHECK(dev) << "Unknown udev device";
41 LOG(INFO) << "Got Device"; 73 LOG(INFO) << "Got Device";
42 LOG(INFO) << " Node: " << udev_device_get_devnode(dev); 74 LOG(INFO) << " Node: " << udev_device_get_devnode(dev);
43 LOG(INFO) << " Subsystem: " << udev_device_get_subsystem(dev); 75 LOG(INFO) << " Subsystem: " << udev_device_get_subsystem(dev);
44 LOG(INFO) << " Devtype: " << udev_device_get_devtype(dev); 76 LOG(INFO) << " Devtype: " << udev_device_get_devtype(dev);
45 LOG(INFO) << " Action: " << udev_device_get_action(dev); 77 LOG(INFO) << " Action: " << udev_device_get_action(dev);
46 udev_device_unref(dev); 78 udev_device_unref(dev);
47 return true; 79 return true;
48 } 80 }
49 81
50 } // namespace cros_disks 82 } // namespace cros_disks
OLDNEW
« no previous file with comments | « no previous file | udev-device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698