Mercurial > emacs
comparison src/ChangeLog @ 110592:c06958da83b5
Add fd handling with callbacks to select, dbus needs it for async operation.
* src/dbusbind.c: Include process.h.
(dbus_fd_cb, xd_find_watch_fd, xd_toggle_watch)
(xd_read_message_1): New functions.
(xd_add_watch, xd_remove_watch): Call xd_find_watch_fd. Handle
watch for both read and write.
(Fdbus_init_bus): Also register xd_toggle_watch.
(Fdbus_call_method_asynchronously, Fdbus_method_return_internal)
(Fdbus_method_error_internal, Fdbus_send_signal): Remove call
to dbus_connection_flush.
(xd_read_message): Move most of the code to xd_read_message_1.
Call xd_read_message_1 until status is COMPLETE.
* src/keyboard.c (readable_events, gobble_input): Remove DBUS code.
* src/process.c (gpm_wait_mask, max_gpm_desc): Remove.
(write_mask): New variable.
(max_input_desc): Renamed from max_keyboard_desc.
(fd_callback_info): New variable.
(add_read_fd, delete_read_fd, add_write_fd, delete_write_fd): New
functions.
(Fmake_network_process): FD_SET write_mask.
(deactivate_process): FD_CLR write_mask.
(wait_reading_process_output): Connecting renamed to Writeok.
check_connect removed. check_write is new. Remove references to
gpm. Use Writeok/check_write unconditionally (i.e. no #ifdef
NON_BLOCKING_CONNECT) instead of Connecting.
Loop over file descriptors and call callbacks in fd_callback_info
if file descriptor is ready for I/O.
(add_gpm_wait_descriptor): Just call add_keyboard_wait_descriptor.
(delete_gpm_wait_descriptor): Just call delete_keyboard_wait_descriptor.
(keyboard_bit_set): Use max_input_desc.
(add_keyboard_wait_descriptor, delete_keyboard_wait_descriptor): Remove
#ifdef subprocesses. Use max_input_desc.
(init_process): Initialize write_mask and fd_callback_info.
* src/process.h (add_read_fd, delete_read_fd, add_write_fd)
(delete_write_fd): Declare.
author | Jan D <jan.h.d@swipnet.se> |
---|---|
date | Sun, 26 Sep 2010 18:20:01 +0200 (2010-09-26) |
parents | 0995e4af573f |
children | 27428f586e5d |
comparison
equal
deleted
inserted
replaced
110591:ab4cdde63001 | 110592:c06958da83b5 |
---|---|
1 2010-09-26 Jan Djč¾°rv <jan.h.d@swipnet.se> | |
2 | |
3 * process.h (add_read_fd, delete_read_fd, add_write_fd) | |
4 (delete_write_fd): Declare. | |
5 | |
6 * process.c (gpm_wait_mask, max_gpm_desc): Remove. | |
7 (write_mask): New variable. | |
8 (max_input_desc): Renamed from max_keyboard_desc. | |
9 (fd_callback_info): New variable. | |
10 (add_read_fd, delete_read_fd, add_write_fd, delete_write_fd): New | |
11 functions. | |
12 (Fmake_network_process): FD_SET write_mask. | |
13 (deactivate_process): FD_CLR write_mask. | |
14 (wait_reading_process_output): Connecting renamed to Writeok. | |
15 check_connect removed. check_write is new. Remove references to | |
16 gpm. Use Writeok/check_write unconditionally (i.e. no #ifdef | |
17 NON_BLOCKING_CONNECT) instead of Connecting. | |
18 Loop over file descriptors and call callbacks in fd_callback_info | |
19 if file descriptor is ready for I/O. | |
20 (add_gpm_wait_descriptor): Just call add_keyboard_wait_descriptor. | |
21 (delete_gpm_wait_descriptor): Just call delete_keyboard_wait_descriptor. | |
22 (keyboard_bit_set): Use max_input_desc. | |
23 (add_keyboard_wait_descriptor, delete_keyboard_wait_descriptor): Remove | |
24 #ifdef subprocesses. Use max_input_desc. | |
25 (init_process): Initialize write_mask and fd_callback_info. | |
26 | |
27 * keyboard.c (readable_events, gobble_input): Remove DBUS code. | |
28 | |
29 * dbusbind.c: Include process.h. | |
30 (dbus_fd_cb, xd_find_watch_fd, xd_toggle_watch) | |
31 (xd_read_message_1): New functions. | |
32 (xd_add_watch, xd_remove_watch): Call xd_find_watch_fd. Handle | |
33 watch for both read and write. | |
34 (Fdbus_init_bus): Also register xd_toggle_watch. | |
35 (Fdbus_call_method_asynchronously, Fdbus_method_return_internal) | |
36 (Fdbus_method_error_internal, Fdbus_send_signal): Remove call | |
37 to dbus_connection_flush. | |
38 (xd_read_message): Move most of the code to xd_read_message_1. | |
39 Call xd_read_message_1 until status is COMPLETE. | |
40 | |
1 2010-09-26 Dan Nicolaescu <dann@ics.uci.edu> | 41 2010-09-26 Dan Nicolaescu <dann@ics.uci.edu> |
2 | 42 |
3 * term.c: Do not include sys/ioctl.h, not needed. | 43 * term.c: Do not include sys/ioctl.h, not needed. |
4 (init_tty): Reorder code to reduce the number of #ifdefs. No code | 44 (init_tty): Reorder code to reduce the number of #ifdefs. No code |
5 changes. | 45 changes. |