chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2be4417
)
event: rename sd_event_get() to sd_event_source_get_event()
author
Lennart Poettering
<lennart@poettering.net>
Fri, 22 Nov 2013 00:28:45 +0000
(
01:28
+0100)
committer
Lennart Poettering
<lennart@poettering.net>
Fri, 22 Nov 2013 00:42:15 +0000
(
01:42
+0100)
src/libsystemd-bus/libsystemd-bus.sym
patch
|
blob
|
history
src/libsystemd-bus/sd-event.c
patch
|
blob
|
history
src/libsystemd-bus/test-event.c
patch
|
blob
|
history
src/socket-proxy/socket-proxyd.c
patch
|
blob
|
history
src/systemd/sd-event.h
patch
|
blob
|
history
diff --git
a/src/libsystemd-bus/libsystemd-bus.sym
b/src/libsystemd-bus/libsystemd-bus.sym
index f8c60b44592fd4441a3ad35227c3114346e1366a..9cf06c44dde003b83276b5b3d288985b2885f29f 100644
(file)
--- a/
src/libsystemd-bus/libsystemd-bus.sym
+++ b/
src/libsystemd-bus/libsystemd-bus.sym
@@
-235,8
+235,6
@@
global:
sd_event_source_ref;
sd_event_source_unref;
sd_event_source_ref;
sd_event_source_unref;
- sd_event_get;
-
sd_event_source_set_prepare;
sd_event_source_get_pending;
sd_event_source_get_priority;
sd_event_source_set_prepare;
sd_event_source_get_pending;
sd_event_source_get_priority;
@@
-254,6
+252,7
@@
global:
sd_event_source_get_time_accuracy;
sd_event_source_get_signal;
sd_event_source_get_child_pid;
sd_event_source_get_time_accuracy;
sd_event_source_get_signal;
sd_event_source_get_child_pid;
+ sd_event_source_get_event;
/* sd-utf8 function */
sd_utf8_is_valid;
/* sd-utf8 function */
sd_utf8_is_valid;
diff --git
a/src/libsystemd-bus/sd-event.c
b/src/libsystemd-bus/sd-event.c
index 2a8eac6df2fdd3cb9401250f7affb41ec45f80d5..6a6581bec616878719614c65136e36d6f0fe197b 100644
(file)
--- a/
src/libsystemd-bus/sd-event.c
+++ b/
src/libsystemd-bus/sd-event.c
@@
-984,7
+984,7
@@
_public_ sd_event_source* sd_event_source_unref(sd_event_source *s) {
return NULL;
}
return NULL;
}
-_public_ sd_event *sd_event_
ge
t(sd_event_source *s) {
+_public_ sd_event *sd_event_
source_get_even
t(sd_event_source *s) {
assert_return(s, NULL);
return s->event;
assert_return(s, NULL);
return s->event;
diff --git
a/src/libsystemd-bus/test-event.c
b/src/libsystemd-bus/test-event.c
index ba60a47a34fb706fdda8d7ae41aea71b8620855d..5360d8758c8b90a70f10c76c93b3293a9885cda3 100644
(file)
--- a/
src/libsystemd-bus/test-event.c
+++ b/
src/libsystemd-bus/test-event.c
@@
-63,7
+63,7
@@
static int child_handler(sd_event_source *s, const siginfo_t *si, void *userdata
assert(userdata == INT_TO_PTR('f'));
assert(userdata == INT_TO_PTR('f'));
- assert_se(sd_event_request_quit(sd_event_
ge
t(s)) >= 0);
+ assert_se(sd_event_request_quit(sd_event_
source_get_even
t(s)) >= 0);
sd_event_source_unref(s);
return 1;
sd_event_source_unref(s);
return 1;
@@
-91,7
+91,7
@@
static int signal_handler(sd_event_source *s, const struct signalfd_siginfo *si,
if (pid == 0)
_exit(0);
if (pid == 0)
_exit(0);
- assert_se(sd_event_add_child(sd_event_
ge
t(s), pid, WEXITED, child_handler, INT_TO_PTR('f'), &p) >= 0);
+ assert_se(sd_event_add_child(sd_event_
source_get_even
t(s), pid, WEXITED, child_handler, INT_TO_PTR('f'), &p) >= 0);
assert_se(sd_event_source_set_enabled(p, SD_EVENT_ONESHOT) >= 0);
sd_event_source_unref(s);
assert_se(sd_event_source_set_enabled(p, SD_EVENT_ONESHOT) >= 0);
sd_event_source_unref(s);
@@
-112,7
+112,7
@@
static int defer_handler(sd_event_source *s, void *userdata) {
assert_se(sigemptyset(&ss) >= 0);
assert_se(sigaddset(&ss, SIGUSR1) >= 0);
assert_se(sigprocmask(SIG_BLOCK, &ss, NULL) >= 0);
assert_se(sigemptyset(&ss) >= 0);
assert_se(sigaddset(&ss, SIGUSR1) >= 0);
assert_se(sigprocmask(SIG_BLOCK, &ss, NULL) >= 0);
- assert_se(sd_event_add_signal(sd_event_
ge
t(s), SIGUSR1, signal_handler, INT_TO_PTR('e'), &p) >= 0);
+ assert_se(sd_event_add_signal(sd_event_
source_get_even
t(s), SIGUSR1, signal_handler, INT_TO_PTR('e'), &p) >= 0);
assert_se(sd_event_source_set_enabled(p, SD_EVENT_ONESHOT) >= 0);
raise(SIGUSR1);
assert_se(sd_event_source_set_enabled(p, SD_EVENT_ONESHOT) >= 0);
raise(SIGUSR1);
@@
-131,7
+131,7
@@
static int time_handler(sd_event_source *s, uint64_t usec, void *userdata) {
if (do_quit) {
sd_event_source *p;
if (do_quit) {
sd_event_source *p;
- assert_se(sd_event_add_defer(sd_event_
ge
t(s), defer_handler, INT_TO_PTR('d'), &p) >= 0);
+ assert_se(sd_event_add_defer(sd_event_
source_get_even
t(s), defer_handler, INT_TO_PTR('d'), &p) >= 0);
assert_se(sd_event_source_set_enabled(p, SD_EVENT_ONESHOT) >= 0);
} else {
assert(!got_c);
assert_se(sd_event_source_set_enabled(p, SD_EVENT_ONESHOT) >= 0);
} else {
assert(!got_c);
diff --git
a/src/socket-proxy/socket-proxyd.c
b/src/socket-proxy/socket-proxyd.c
index 8cba8e06798e80eef0e963e7ec8a1644b22b7613..432558d190376955432267d41e5126af7004e1a5 100644
(file)
--- a/
src/socket-proxy/socket-proxyd.c
+++ b/
src/socket-proxy/socket-proxyd.c
@@
-287,7
+287,7
@@
static int traffic_cb(sd_event_source *s, int fd, uint32_t revents, void *userda
if (c->client_fd == -1 && c->client_to_server_buffer_full <= 0)
goto quit;
if (c->client_fd == -1 && c->client_to_server_buffer_full <= 0)
goto quit;
- r = connection_enable_event_sources(c, sd_event_
ge
t(s));
+ r = connection_enable_event_sources(c, sd_event_
source_get_even
t(s));
if (r < 0)
goto quit;
if (r < 0)
goto quit;
@@
-373,7
+373,7
@@
static int connect_cb(sd_event_source *s, int fd, uint32_t revents, void *userda
if (r < 0)
goto fail;
if (r < 0)
goto fail;
- r = connection_enable_event_sources(c, sd_event_
ge
t(s));
+ r = connection_enable_event_sources(c, sd_event_
source_get_even
t(s));
if (r < 0)
goto fail;
if (r < 0)
goto fail;
@@
-477,7
+477,7
@@
static int accept_cb(sd_event_source *s, int fd, uint32_t revents, void *userdat
getpeername_pretty(nfd, &peer);
log_debug("New connection from %s", strna(peer));
getpeername_pretty(nfd, &peer);
log_debug("New connection from %s", strna(peer));
- r = add_connection_socket(context, sd_event_
ge
t(s), nfd);
+ r = add_connection_socket(context, sd_event_
source_get_even
t(s), nfd);
if (r < 0) {
close_nointr_nofail(fd);
return r;
if (r < 0) {
close_nointr_nofail(fd);
return r;
diff --git
a/src/systemd/sd-event.h
b/src/systemd/sd-event.h
index e7b6c9ec9bca74d01f0851d0940e9ce9061d0fa0..63b223c854eeec6f07541be88e63f59f527ffa86 100644
(file)
--- a/
src/systemd/sd-event.h
+++ b/
src/systemd/sd-event.h
@@
-97,8
+97,6
@@
int sd_event_get_now_monotonic(sd_event *e, uint64_t *usec);
sd_event_source* sd_event_source_ref(sd_event_source *s);
sd_event_source* sd_event_source_unref(sd_event_source *s);
sd_event_source* sd_event_source_ref(sd_event_source *s);
sd_event_source* sd_event_source_unref(sd_event_source *s);
-sd_event *sd_event_get(sd_event_source *s);
-
int sd_event_source_set_prepare(sd_event_source *s, sd_event_handler_t callback);
int sd_event_source_get_pending(sd_event_source *s);
int sd_event_source_get_priority(sd_event_source *s, int *priority);
int sd_event_source_set_prepare(sd_event_source *s, sd_event_handler_t callback);
int sd_event_source_get_pending(sd_event_source *s);
int sd_event_source_get_priority(sd_event_source *s, int *priority);
@@
-116,6
+114,7
@@
int sd_event_source_set_time_accuracy(sd_event_source *s, uint64_t usec);
int sd_event_source_get_time_accuracy(sd_event_source *s, uint64_t *usec);
int sd_event_source_get_signal(sd_event_source *s);
int sd_event_source_get_child_pid(sd_event_source *s, pid_t *pid);
int sd_event_source_get_time_accuracy(sd_event_source *s, uint64_t *usec);
int sd_event_source_get_signal(sd_event_source *s);
int sd_event_source_get_child_pid(sd_event_source *s, pid_t *pid);
+sd_event *sd_event_source_get_event(sd_event_source *s);
_SD_END_DECLARATIONS;
_SD_END_DECLARATIONS;