Codebase list i3-gaps / 38f2818
Remove some includes from all.h Also removes duplicates from other headers All used std* imports are included once in all.h for easy use - getopt: Only used in main.c and inject_randr1.5.c - glob: Not used in i3, only in i3bar & libi3 - inttypes: Only used in util.c - locale: A bit specific for all.h - math: Slow according to #4022 - unistd: I feel it's good to explicitly include per file that needs it - yajl: Specific to yajl_utils.h and ipc.h Related to #4022 Timing before: ``` Analyzing build trace from ... **** Time summary: Compilation (81 times): Parsing (frontend): 51.3 s Codegen & opts (backend): 7.7 s **** Files that took longest to parse (compiler frontend): 1254 ms: build/src/i3-commands.o 972 ms: build/src/i3-resize.o 945 ms: build/src/i3-con.o 921 ms: build/src/i3-scratchpad.o 907 ms: build/src/i3-main.o 904 ms: build/src/i3-handlers.o 904 ms: build/src/i3-config_directives.o 893 ms: build/src/i3-restore_layout.o 875 ms: build/src/i3-x.o 854 ms: build/src/i3-ipc.o **** Files that took longest to codegen (compiler backend): 863 ms: build/src/i3-commands.o 471 ms: build/i3bar/src/i3bar-xcb.o 377 ms: build/src/i3-con.o 360 ms: build/src/i3-ipc.o 306 ms: build/src/i3-x.o 290 ms: build/src/i3-main.o 238 ms: build/src/i3-config_parser.o 237 ms: build/src/i3-handlers.o 220 ms: build/i3-config-wizard/i3_config_wizard-main.o 214 ms: build/src/i3-bindings.o **** Functions that took longest to compile: 209 ms: main (../../i3/src/main.c) 95 ms: manage_window (../../i3/src/manage.c) 57 ms: reconfig_windows (../../i3/i3bar/src/xcb.c) 55 ms: x_draw_decoration (../../i3/src/x.c) 49 ms: x_push_node (../../i3/src/x.c) 48 ms: handle_client_message (../../i3/src/handlers.c) 48 ms: dump_node (../../i3/src/ipc.c) 47 ms: GENERATED_call (../../i3/src/config_parser.c) 45 ms: config_string_cb (../../i3/i3bar/src/config.c) 44 ms: GENERATED_call (../../i3/src/commands_parser.c) 42 ms: floating_check_size (../../i3/src/floating.c) 40 ms: con_swap (../../i3/src/con.c) 40 ms: parse_config (../../i3/src/config_parser.c) 39 ms: main (../../i3/i3-nagbar/main.c) 39 ms: cmd_rename_workspace (../../i3/src/commands.c) 38 ms: window_update_normal_hints (../../i3/src/window.c) 38 ms: cmd_swap (../../i3/src/commands.c) 37 ms: dump_bar_config (../../i3/src/ipc.c) 36 ms: translate_keysyms (../../i3/src/bindings.c) 35 ms: tree_close_internal (../../i3/src/tree.c) 34 ms: match_matches_window (../../i3/src/match.c) 34 ms: floating_enable (../../i3/src/floating.c) 34 ms: json_string (../../i3/src/load_layout.c) 33 ms: x_push_changes (../../i3/src/x.c) 33 ms: main (../../i3/i3-config-wizard/main.c) 31 ms: free_configuration (../../i3/src/config.c) 30 ms: parse_file (../../i3/src/config_parser.c) 28 ms: load_font (../../i3/libi3/font.c) 28 ms: handle_configure_request (../../i3/src/handlers.c) 28 ms: parse_command (../../i3/src/commands_parser.c) **** Function sets that took longest to compile / optimize: *** Expensive headers: 29287 ms: ../../i3/include/libi3.h (included 78 times, avg 375 ms), included via: i3-resize.o all.h data.h (576 ms) a-g_utf8_make_valid.o (491 ms) a-dpi.o (491 ms) a-get_colorpixel.o (483 ms) a-is_debug_build.o (478 ms) a-strndup.o (478 ms) ... 29221 ms: ../../i3/include/all.h (included 39 times, avg 749 ms), included via: i3-resize.o (946 ms) i3-scratchpad.o (895 ms) i3-restore_layout.o (865 ms) i3-handlers.o (839 ms) i3-drag.o (830 ms) i3-config_directives.o (793 ms) ... 5195 ms: /usr/include/xcb/xcb.h (included 79 times, avg 65 ms), included via: i3-handlers.o all.h (113 ms) i3-restore_layout.o all.h (108 ms) a-g_utf8_make_valid.o libi3.h (108 ms) i3bar-xcb.o common.h (105 ms) i3-scratchpad.o all.h (95 ms) a-get_colorpixel.o libi3.h (89 ms) ... 4100 ms: /usr/include/math.h (included 41 times, avg 100 ms), included via: i3-scratchpad.o all.h (180 ms) i3-fake_outputs.o all.h (138 ms) i3-regex.o all.h (130 ms) i3-restore_layout.o all.h (128 ms) i3-xcb.o all.h (121 ms) i3-move.o all.h (119 ms) ... 4046 ms: ../../i3/i3bar/include/common.h (included 9 times, avg 449 ms), included via: i3bar-main.o (503 ms) i3bar-xcb.o (501 ms) i3bar-workspaces.o (472 ms) i3bar-parse_json_header.o (446 ms) i3bar-child.o (438 ms) i3bar-ipc.o (434 ms) ... 2713 ms: ../../i3/include/i3.h (included 41 times, avg 66 ms), included via: i3-xcursor.o (450 ms) i3-config_directives.o all.h ipc.h configuration.h (87 ms) i3-config.o all.h ipc.h configuration.h (71 ms) i3-manage.o all.h ipc.h configuration.h (70 ms) i3-window.o all.h ipc.h configuration.h (68 ms) i3-x.o all.h ipc.h configuration.h (61 ms) ... 1492 ms: /usr/include/xcb/xkb.h (included 42 times, avg 35 ms), included via: i3-config_directives.o all.h ipc.h configuration.h i3.h (50 ms) i3-config.o all.h ipc.h configuration.h i3.h (45 ms) i3-window.o all.h ipc.h configuration.h i3.h (43 ms) i3-x.o all.h ipc.h configuration.h i3.h (42 ms) i3-manage.o all.h ipc.h configuration.h i3.h (41 ms) i3-config_parser.o all.h ipc.h configuration.h i3.h (38 ms) ... 1432 ms: /usr/include/stdlib.h (included 79 times, avg 18 ms), included via: i3-scratchpad.o all.h (48 ms) i3-restore_layout.o all.h (36 ms) i3-regex.o all.h (32 ms) i3-key_press.o all.h (28 ms) i3-commands.o all.h (28 ms) i3-bindings.o all.h (24 ms) ... 1349 ms: /usr/include/pthread.h (included 79 times, avg 17 ms), included via: i3bar-xcb.o common.h xcb.h (33 ms) a-ucs2_conversion.o libi3.h xcb.h (32 ms) i3-match.o all.h xcb.h (27 ms) i3-scratchpad.o all.h xcb.h (25 ms) a-g_utf8_make_valid.o libi3.h xcb.h (25 ms) i3_config_wizard-main.o xcb.h (24 ms) ... 1151 ms: /usr/include/X11/Xlib.h (included 45 times, avg 25 ms), included via: i3-output.o all.h data.h sn-launcher.h sn-common.h (50 ms) i3-config_parser.o all.h data.h sn-launcher.h sn-common.h (43 ms) i3-x.o all.h data.h sn-launcher.h sn-common.h (34 ms) i3-config_directives.o all.h data.h sn-launcher.h sn-common.h (32 ms) i3_config_wizard-main.o sn-launchee.h sn-common.h (30 ms) i3-drag.o all.h data.h sn-launcher.h sn-common.h (29 ms) ... ``` Timing after: ``` Analyzing build trace from ... **** Time summary: Compilation (81 times): Parsing (frontend): 47.6 s Codegen & opts (backend): 7.6 s **** Files that took longest to parse (compiler frontend): 1154 ms: build/src/i3-commands.o 929 ms: build/src/i3-display_version.o 852 ms: build/src/i3-bindings.o 847 ms: build/src/i3-con.o 806 ms: build/src/i3-ipc.o 801 ms: build/src/i3-floating.o 792 ms: build/src/i3-main.o 792 ms: build/src/i3-drag.o 792 ms: build/src/i3-window.o 776 ms: build/src/i3-config_directives.o **** Files that took longest to codegen (compiler backend): 885 ms: build/src/i3-commands.o 422 ms: build/i3bar/src/i3bar-xcb.o 382 ms: build/src/i3-con.o 348 ms: build/src/i3-x.o 288 ms: build/src/i3-ipc.o 268 ms: build/src/i3-handlers.o 254 ms: build/src/i3-main.o 251 ms: build/src/i3-floating.o 249 ms: build/src/i3-config_parser.o 194 ms: build/src/i3-randr.o **** Functions that took longest to compile: 186 ms: main (../../i3/src/main.c) 95 ms: manage_window (../../i3/src/manage.c) 65 ms: floating_check_size (../../i3/src/floating.c) 63 ms: x_draw_decoration (../../i3/src/x.c) 58 ms: handle_client_message (../../i3/src/handlers.c) 55 ms: x_push_node (../../i3/src/x.c) 54 ms: match_matches_window (../../i3/src/match.c) 51 ms: parse_config (../../i3/src/config_parser.c) 49 ms: dump_node (../../i3/src/ipc.c) 47 ms: reconfig_windows (../../i3/i3bar/src/xcb.c) 47 ms: config_string_cb (../../i3/i3bar/src/config.c) 45 ms: GENERATED_call (../../i3/src/config_parser.c) 45 ms: GENERATED_call (../../i3/src/commands_parser.c) 43 ms: floating_enable (../../i3/src/floating.c) 42 ms: handle_configure_request (../../i3/src/handlers.c) 40 ms: con_swap (../../i3/src/con.c) 36 ms: main (../../i3/i3-input/main.c) 36 ms: main (../../i3/i3-msg/main.c) 36 ms: main (../../i3/i3-nagbar/main.c) 36 ms: cmd_move_con_to_workspace_number (../../i3/src/commands.c) 35 ms: json_string (../../i3/src/load_layout.c) 35 ms: tree_restore (../../i3/src/tree.c) 35 ms: cmd_swap (../../i3/src/commands.c) 34 ms: x_push_changes (../../i3/src/x.c) 32 ms: main (../../i3/i3-config-wizard/main.c) 32 ms: ewmh_setup_hints (../../i3/src/ewmh.c) 31 ms: match_parse_property (../../i3/src/match.c) 30 ms: cmd_mark (../../i3/src/commands.c) 30 ms: translate_keysyms (../../i3/src/bindings.c) 30 ms: window_update_normal_hints (../../i3/src/window.c) **** Function sets that took longest to compile / optimize: *** Expensive headers: 29596 ms: ../../i3/include/libi3.h (included 78 times, avg 379 ms), included via: a-get_config_path.o (539 ms) i3_dump_log-main.o (522 ms) i3_config_wizard-main.o (501 ms) a-fake_configure_notify.o (500 ms) a-root_atom_contents.o (488 ms) i3-display_version.o all.h (466 ms) ... 26054 ms: ../../i3/include/all.h (included 41 times, avg 635 ms), included via: i3-display_version.o (901 ms) i3-drag.o (775 ms) i3-ewmh.o (703 ms) i3-startup.o (693 ms) i3-commands.o (687 ms) i3-xcb.o (680 ms) ... 5345 ms: /usr/include/xcb/xcb.h (included 79 times, avg 67 ms), included via: i3-display_version.o all.h (173 ms) i3_input-keysym2ucs.o keysym2ucs.h (106 ms) i3-ewmh.o all.h (106 ms) a-fake_configure_notify.o libi3.h (103 ms) a-get_config_path.o libi3.h (95 ms) i3bar-parse_json_header.o common.h (93 ms) ... 4127 ms: ../../i3/i3bar/include/common.h (included 9 times, avg 458 ms), included via: i3bar-child.o (524 ms) i3bar-mode.o (486 ms) i3bar-outputs.o (464 ms) i3bar-parse_json_header.o (463 ms) i3bar-config.o (457 ms) i3bar-ipc.o (448 ms) ... 1542 ms: /usr/include/xcb/xkb.h (included 42 times, avg 36 ms), included via: i3-con.o all.h ipc.h configuration.h i3.h (60 ms) i3-render.o all.h ipc.h configuration.h i3.h (56 ms) i3-bindings.o all.h ipc.h configuration.h i3.h (56 ms) i3-sighandler.o all.h ipc.h configuration.h i3.h (48 ms) i3-xcb.o all.h ipc.h configuration.h i3.h (47 ms) i3-resize.o all.h ipc.h configuration.h i3.h (39 ms) ... 1456 ms: /usr/include/stdlib.h (included 79 times, avg 18 ms), included via: i3-drag.o all.h (60 ms) i3-display_version.o all.h (55 ms) i3-fake_outputs.o all.h (39 ms) i3-config_directives.o all.h (33 ms) i3-xcursor.o all.h (30 ms) i3bar-mode.o common.h libi3.h pango.h pango-attributes.h pango-font.h pango-coverage.h glib-object.h gbinding.h glib.h gasyncqueue.h gthread.h gutils.h (29 ms) ... 1136 ms: /usr/include/X11/Xlib.h (included 44 times, avg 25 ms), included via: i3-con.o all.h data.h sn-launcher.h sn-common.h (35 ms) i3-resize.o all.h data.h sn-launcher.h sn-common.h (34 ms) i3-util.o all.h data.h sn-launcher.h sn-common.h (33 ms) i3-assignments.o all.h data.h sn-launcher.h sn-common.h (33 ms) i3-sighandler.o all.h data.h sn-launcher.h sn-common.h (31 ms) i3-xcb.o all.h data.h sn-launcher.h sn-common.h (31 ms) ... 808 ms: /usr/include/stdio.h (included 79 times, avg 10 ms), included via: i3-drag.o all.h (19 ms) i3-fake_outputs.o all.h (18 ms) a-font.o libi3.h (16 ms) i3bar-child.o common.h libi3.h (15 ms) a-safewrappers.o libi3.h (15 ms) a-ipc_send_message.o libi3.h (13 ms) ... 770 ms: /usr/include/xcb/randr.h (included 42 times, avg 18 ms), included via: i3-click.o all.h data.h (29 ms) i3-commands.o all.h data.h (27 ms) i3-assignments.o all.h data.h (25 ms) i3-xcb.o all.h data.h (21 ms) i3-resize.o all.h data.h (21 ms) i3-sighandler.o all.h data.h (20 ms) ... 688 ms: /usr/include/math.h (included 6 times, avg 114 ms), included via: a-dpi.o (145 ms) i3-render.o (127 ms) i3-floating.o (106 ms) a-root_atom_contents.o (106 ms) i3-window.o (102 ms) i3-bindings.o (99 ms) ... ``` Orestis Floros 4 years ago
24 changed file(s) with 39 addition(s) and 39 deletion(s). Raw diff Collapse all Expand all
88 *
99 */
1010 #include <config.h>
11 #include "libi3.h"
1211
1312 #include "libi3.h"
1413
88 *
99 */
1010 #include <config.h>
11
1112 #include "libi3.h"
1213
1314 #include <err.h>
1414 #include <config.h>
1515
1616 #include <assert.h>
17 #include <err.h>
18 #include <errno.h>
19 #include <limits.h>
20 #include <stdarg.h>
1721 #include <stdbool.h>
22 #include <stdint.h>
23 #include <stdio.h>
1824 #include <stdlib.h>
19 #include <stdio.h>
2025 #include <string.h>
21 #include <locale.h>
22 #include <getopt.h>
23 #include <unistd.h>
2426 #include <sys/stat.h>
2527 #include <sys/types.h>
26 #include <glob.h>
27 #include <errno.h>
28 #include <err.h>
29 #include <stdint.h>
30 #include <inttypes.h>
31 #include <math.h>
32 #include <limits.h>
3328
3429 #include <xcb/xcb.h>
3530 #include <xcb/xcb_aux.h>
31 #include <xcb/xcb_icccm.h>
3632 #include <xcb/xcb_keysyms.h>
37 #include <xcb/xcb_icccm.h>
3833
39 #include <yajl/yajl_gen.h>
40 #include <yajl/yajl_version.h>
41
34 #include "libi3.h"
4235 #include "data.h"
4336 #include "util.h"
4437 #include "ipc.h"
7164 #include "ewmh.h"
7265 #include "assignments.h"
7366 #include "regex.h"
74 #include "libi3.h"
7567 #include "startup.h"
7668 #include "scratchpad.h"
7769 #include "commands.h"
1111 */
1212 #pragma once
1313
14 #include "libi3.h"
15
16 #include <stdbool.h>
1714 #include "queue.h"
1815 #include "i3.h"
1916
88 */
99 #pragma once
1010
11 #include "libi3.h"
12
1311 #define SN_API_NOT_YET_FROZEN 1
1412 #include <libsn/sn-launcher.h>
1513
1614 #include <xcb/randr.h>
17 #include <stdbool.h>
1815 #include <pcre.h>
1916 #include <sys/time.h>
2017
1111 #include <config.h>
1212
1313 #include <ev.h>
14 #include <stdbool.h>
1514 #include <yajl/yajl_gen.h>
1615 #include <yajl/yajl_parse.h>
1716
99 #pragma once
1010
1111 #include <config.h>
12
13 #include <stdarg.h>
14 #include <stdbool.h>
1512
1613 /* We will include libi3.h which define its own version of LOG, ELOG.
1714 * We want *our* version, so we undef the libi3 one. */
1111
1212 #include <config.h>
1313
14 #include <stdint.h>
1514 #if !defined(__OpenBSD__)
1615 #include <pthread.h>
1716 #endif
1212
1313 #include <config.h>
1414
15 #include "data.h"
16
1715 /**
1816 * We have just established a connection to the X server and need the initial
1917 * Xinerama information to setup workspaces for each screen.
66 * bindings.c: Functions for configuring, finding and, running bindings.
77 */
88 #include "all.h"
9
10 #include <math.h>
911
1012 #include <xkbcommon/xkbcommon-x11.h>
1113 #include <xkbcommon/xkbcommon.h>
1111
1212 #include <fcntl.h>
1313 #include <time.h>
14 #include <unistd.h>
1415
1516 static bool human_readable_key, loaded_config_file_name_key;
1617 static char *human_readable_version, *loaded_config_file_name;
77 *
88 */
99 #include "all.h"
10
11 #include <math.h>
1012
1113 #ifndef MAX
1214 #define MAX(x, y) ((x) > (y) ? (x) : (y))
1313 #include <ev.h>
1414 #include <fcntl.h>
1515 #include <libgen.h>
16 #include <locale.h>
1617 #include <stdint.h>
1718 #include <sys/socket.h>
1819 #include <sys/un.h>
20 #include <unistd.h>
1921
2022 #include <yajl/yajl_gen.h>
2123 #include <yajl/yajl_parse.h>
88 *
99 */
1010 #include "all.h"
11
12 #include <locale.h>
1113
1214 #include <yajl/yajl_parse.h>
1315
88 */
99 #include <config.h>
1010
11 #include "i3.h"
12 #include "libi3.h"
13 #include "log.h"
11 #include "all.h"
1412 #include "shmlog.h"
15 #include "util.h"
1613
1714 #include <errno.h>
1815 #include <fcntl.h>
1111
1212 #include <ev.h>
1313 #include <fcntl.h>
14 #include <getopt.h>
1415 #include <libgen.h>
16 #include <locale.h>
1517 #include <signal.h>
1618 #include <sys/mman.h>
1719 #include <sys/resource.h>
2022 #include <sys/time.h>
2123 #include <sys/types.h>
2224 #include <sys/un.h>
25 #include <unistd.h>
2326
2427 #ifdef I3_ASAN_ENABLED
2528 #include <sanitizer/lsan_interface.h>
88 *
99 */
1010 #include "all.h"
11
12 #include <math.h>
1113
1214 /* Forward declarations */
1315 static int *precalculate_sizes(Con *con, render_params *p);
88
99 #include <signal.h>
1010 #include <sys/wait.h>
11 #include <unistd.h>
1112
1213 typedef struct dialog_t {
1314 xcb_window_t id;
1515 #include <paths.h>
1616 #include <sys/types.h>
1717 #include <sys/wait.h>
18 #include <unistd.h>
1819
1920 #define SN_API_NOT_YET_FROZEN 1
2021 #include <libsn/sn-launcher.h>
99 */
1010 #include "all.h"
1111
12 #include <ctype.h>
13 #include <fcntl.h>
14 #include <inttypes.h>
15 #include <libgen.h>
16 #include <locale.h>
1217 #include <sys/wait.h>
18 #include <unistd.h>
1319 #if defined(__OpenBSD__)
1420 #include <sys/cdefs.h>
1521 #endif
16 #include <ctype.h>
17 #include <fcntl.h>
18 #include <libgen.h>
1922
2023 int min(int a, int b) {
2124 return (a < b ? a : b);
77 *
88 */
99 #include "all.h"
10
11 #include <math.h>
1012
1113 /*
1214 * Frees an i3Window and all its members.
88 *
99 */
1010 #include "all.h"
11
12 #include <unistd.h>
1113
1214 #ifndef MAX
1315 #define MAX(x, y) ((x) > (y) ? (x) : (y))
88 */
99 #include <config.h>
1010
11 #include "i3.h"
12 #include "xcb.h"
11 #include "all.h"
1312
1413 #include <assert.h>
1514 #include <err.h>
1515
1616 #include <ev.h>
1717 #include <fcntl.h>
18 #include <getopt.h>
1819 #include <libgen.h>
1920 #include <sys/mman.h>
2021 #include <sys/resource.h>
2425 #include <sys/types.h>
2526 #include <sys/un.h>
2627 #include <sys/wait.h>
28 #include <unistd.h>
2729
2830 static void uds_connection_cb(EV_P_ ev_io *w, int revents);
2931 static void read_client_setup_request_cb(EV_P_ ev_io *w, int revents);