KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Finish move of prewarm launcher into its own compilation unit

Browse Source
This commit is contained in:
Kovid Goyal 2022-07-05 19:18:36 +05:30
parent 4195c239c8
commit 09ddbbf600
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
launcher.c
View File

@ -5,8 +5,6 @@
* Distributed under terms of the GPL3 license. * Distributed under terms of the GPL3 license.
*/ */
#include "prewarm-launcher.h"
#include <libgen.h> #include <libgen.h>
#ifdef __APPLE__ #ifdef __APPLE__
#include <mach-o/dyld.h> #include <mach-o/dyld.h>
@ -15,6 +13,8 @@
#else #else
#include <limits.h> #include <limits.h>
#endif #endif
#include <stdbool.h>
#include <stdint.h>
#include <wchar.h> #include <wchar.h>
#include <Python.h> #include <Python.h>
@ -268,6 +268,8 @@ read_exe_path(char *exe, size_t buf_sz) {
} }
#endif // }}} #endif // }}}
extern void use_prewarmed_process(int argc, char *argv[]);
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
if (argc < 1 || !argv) { fprintf(stderr, "Invalid argc/argv\n"); return 1; } if (argc < 1 || !argv) { fprintf(stderr, "Invalid argc/argv\n"); return 1; }
use_prewarmed_process(argc, argv); use_prewarmed_process(argc, argv);

4
prewarm-launcher.c
View File

@ -4,8 +4,6 @@
* Distributed under terms of the GPL3 license. * Distributed under terms of the GPL3 license.
*/ */
#pragma once
// for SA_RESTART // for SA_RESTART
#define _XOPEN_SOURCE 700 #define _XOPEN_SOURCE 700
// for cfmakeraw // for cfmakeraw
@ -510,7 +508,7 @@ check_socket_addr(char *addr) {
return p + 1; return p + 1;
} }
static void void
use_prewarmed_process(int argc, char *argv[]) { use_prewarmed_process(int argc, char *argv[]) {
char *env_addr = getenv("KITTY_PREWARM_SOCKET"); char *env_addr = getenv("KITTY_PREWARM_SOCKET");
if (!env_addr || !*env_addr || !is_prewarmable(argc, argv)) return; if (!env_addr || !*env_addr || !is_prewarmable(argc, argv)) return;

16
setup.py
View File

@ -864,13 +864,17 @@ def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 's
# RUNPATH locations for transitive dependencies, unlike RPATH. # RUNPATH locations for transitive dependencies, unlike RPATH.
ldflags += ['-Wl,--disable-new-dtags', '-Wl,-rpath,$ORIGIN/../lib'] ldflags += ['-Wl,--disable-new-dtags', '-Wl,-rpath,$ORIGIN/../lib']
os.makedirs(launcher_dir, exist_ok=True) os.makedirs(launcher_dir, exist_ok=True)
objects = []
for src in ('launcher.c', 'prewarm-launcher.c'):
obj = os.path.join(build_dir, src.replace('.c', '.o'))
objects.append(obj)
cmd = env.cc + cppflags + cflags + ['-c', src, '-o', obj]
key = CompileKey('launcher.c', os.path.basename(obj))
args.compilation_database.add_command(f'Compiling {emphasis(src)} ...', cmd, partial(newer, obj, src), key=key, keyfile=src)
dest = os.path.join(launcher_dir, 'kitty') dest = os.path.join(launcher_dir, 'kitty')
src = 'launcher.c' desc = f'Linking {emphasis("launcher")} ...'
cmd = env.cc + cppflags + cflags + [ cmd = env.cc + ldflags + objects + libs + pylib + ['-o', dest]
src, '-o', dest] + ldflags + libs + pylib args.compilation_database.add_command(desc, cmd, partial(newer, dest, *objects), key=CompileKey('', 'kitty'))
key = CompileKey('launcher.c', 'kitty')
desc = f'Building {emphasis("launcher")} ...'
args.compilation_database.add_command(desc, cmd, partial(newer, dest, src, "prewarm-launcher.h"), key=key, keyfile=src)
args.compilation_database.build_all() args.compilation_database.build_all()