1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
|
--- ./net/proxy/proxy_config_service_linux.cc.orig 2014-08-20 21:02:28.000000000 +0200
+++ ./net/proxy/proxy_config_service_linux.cc 2014-08-22 15:06:26.000000000 +0200
@@ -21,7 +21,13 @@
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
+#if defined(OS_FREEBSD)
+#include <sys/types.h>
+#include <sys/event.h>
+#include <sys/time.h>
+#else
#include <sys/inotify.h>
+#endif
#include <unistd.h>
#include <map>
@@ -861,9 +867,10 @@
public base::MessagePumpLibevent::Watcher {
public:
explicit SettingGetterImplKDE(base::Environment* env_var_getter)
- : inotify_fd_(-1), notify_delegate_(NULL), indirect_manual_(false),
- auto_no_pac_(false), reversed_bypass_list_(false),
- env_var_getter_(env_var_getter), file_loop_(NULL) {
+ : inotify_fd_(-1), config_fd_(-1), notify_delegate_(NULL),
+ indirect_manual_(false), auto_no_pac_(false),
+ reversed_bypass_list_(false), env_var_getter_(env_var_getter),
+ file_loop_(NULL) {
// This has to be called on the UI thread (http://crbug.com/69057).
base::ThreadRestrictions::ScopedAllowIO allow_io;
@@ -927,9 +934,10 @@
// and pending tasks may then be deleted without being run.
// Here in the KDE version, we can safely close the file descriptor
// anyway. (Not that it really matters; the process is exiting.)
- if (inotify_fd_ >= 0)
+ if (inotify_fd_ >= 0 || config_fd_ >= 0)
ShutDown();
DCHECK(inotify_fd_ < 0);
+ DCHECK(config_fd_ < 0);
}
virtual bool Init(base::SingleThreadTaskRunner* glib_thread_task_runner,
@@ -937,11 +945,21 @@
// This has to be called on the UI thread (http://crbug.com/69057).
base::ThreadRestrictions::ScopedAllowIO allow_io;
DCHECK(inotify_fd_ < 0);
+#if defined(OS_FREEBSD)
+ inotify_fd_ = kqueue();
+#else
inotify_fd_ = inotify_init();
+#endif
if (inotify_fd_ < 0) {
+#if defined(OS_FREEBSD)
+ PLOG(ERROR) << "kqueue failed";
+#else
PLOG(ERROR) << "inotify_init failed";
+#endif
return false;
}
+
+#if !defined(OS_FREEBSD)
int flags = fcntl(inotify_fd_, F_GETFL);
if (fcntl(inotify_fd_, F_SETFL, flags | O_NONBLOCK) < 0) {
PLOG(ERROR) << "fcntl failed";
@@ -949,6 +967,7 @@
inotify_fd_ = -1;
return false;
}
+#endif
file_loop_ = file_loop;
// The initial read is done on the current thread, not |file_loop_|,
// since we will need to have it for SetUpAndFetchInitialConfig().
@@ -963,20 +982,38 @@
close(inotify_fd_);
inotify_fd_ = -1;
}
+ if (config_fd_ >= 0) {
+ close(config_fd_);
+ config_fd_ = -1;
+ }
}
virtual bool SetUpNotifications(
ProxyConfigServiceLinux::Delegate* delegate) OVERRIDE {
DCHECK(inotify_fd_ >= 0);
+ DCHECK(config_fd_ >= 0);
DCHECK(base::MessageLoop::current() == file_loop_);
// We can't just watch the kioslaverc file directly, since KDE will write
// a new copy of it and then rename it whenever settings are changed and
// inotify watches inodes (so we'll be watching the old deleted file after
// the first change, and it will never change again). So, we watch the
// directory instead. We then act only on changes to the kioslaverc entry.
+#if defined(OS_FREEBSD)
+ config_fd_ = HANDLE_EINTR(open(kde_config_dir_.value().c_str(), O_RDONLY));
+
+ if (config_fd_ == -1)
+ return false;
+
+ struct kevent ev;
+ EV_SET(&ev, config_fd_, EVFILT_VNODE, EV_ADD | EV_CLEAR, NOTE_WRITE,
+ 0, NULL);
+ if (kevent(inotify_fd_, &ev, 1, NULL, 0, NULL) == -1)
+ return false;
+#else
if (inotify_add_watch(inotify_fd_, kde_config_dir_.value().c_str(),
IN_MODIFY | IN_MOVED_TO) < 0)
return false;
+#endif
notify_delegate_ = delegate;
if (!file_loop_->WatchFileDescriptor(inotify_fd_,
true,
@@ -997,7 +1034,19 @@
virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE {
DCHECK_EQ(fd, inotify_fd_);
DCHECK(base::MessageLoop::current() == file_loop_);
+#if defined(OS_FREEBSD)
+ struct kevent ev;
+ int rv = kevent(inotify_fd_, NULL, 0, &ev, 1, NULL);
+
+ if (rv != -1 && (ev.flags & EV_ERROR) == 0) {
+ OnChangeNotification();
+ } else {
+ LOG(ERROR) << "kevent() failure; no longer watching kioslaverc!";
+ ShutDown();
+ }
+#else
OnChangeNotification();
+#endif
}
virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE {
NOTREACHED();
@@ -1276,8 +1325,11 @@
void OnChangeNotification() {
DCHECK_GE(inotify_fd_, 0);
DCHECK(base::MessageLoop::current() == file_loop_);
- char event_buf[(sizeof(inotify_event) + NAME_MAX + 1) * 4];
bool kioslaverc_touched = false;
+#if defined(OS_BSD)
+ kioslaverc_touched = true;
+#else
+ char event_buf[(sizeof(inotify_event) + NAME_MAX + 1) * 4];
ssize_t r;
while ((r = read(inotify_fd_, event_buf, sizeof(event_buf))) > 0) {
// inotify returns variable-length structures, which is why we have
@@ -1314,6 +1366,7 @@
inotify_fd_ = -1;
}
}
+#endif
if (kioslaverc_touched) {
// We don't use Reset() because the timer may not yet be running.
// (In that case Stop() is a no-op.)
@@ -1329,6 +1382,7 @@
std::vector<std::string> > strings_map_type;
int inotify_fd_;
+ int config_fd_;
base::MessagePumpLibevent::FileDescriptorWatcher inotify_watcher_;
ProxyConfigServiceLinux::Delegate* notify_delegate_;
base::OneShotTimer<SettingGetterImplKDE> debounce_timer_;
|
