Compare commits

...
2 Commits
12 ... 14
Author SHA1 Message Date
Arjan van de Ven ca63e1be25 Wait with curl init until the first connection comes in
this should save a bunch of memory for the common case
2015-02-16 18:12:45 -05:00
Dimitri John Ledkov 078e9987d5 clr-debug-info: Use well known install paths.
systemd pkgconfig module is already required, which will have system
paths defined as pkg-config variables. This simplifies autofoo, and
installs tmpfile.d into a system location under /usr, rather than
admin location under /etc.
2015-02-02 10:30:49 +00:00
3 changed files with 14 additions and 16 deletions
+2 -5
View File
@@ -14,9 +14,6 @@ clr_debug_fuse_LDADD = ${fuse_LIBS} $(glib_LIBS)
clr_debug_daemon_LDADD = $(glib_LIBS) ${curl_LIBS} clr_debug_daemon_LDADD = $(glib_LIBS) ${curl_LIBS}
clr_debug_prepare_LDADD = $(glib_LIBS) clr_debug_prepare_LDADD = $(glib_LIBS)
systemdsystemunit_DATA = clr_debug_fuse.service clr_debug_daemon.service
systemdunitdir = @SYSTEMD_UNITDIR@ tmpfiles_DATA = debuginfo.conf
systemdunit_DATA = clr_debug_fuse.service clr_debug_daemon.service
tmpwatchdir = /etc/tmpfiles.d
tmpwatch_DATA = debuginfo.conf
+6 -9
View File
@@ -3,7 +3,7 @@
AC_PREREQ([2.66]) AC_PREREQ([2.66])
AC_INIT(clr-debug-info, 11, arjan@linux.intel.com) AC_INIT(clr-debug-info, 11, arjan@linux.intel.com)
AM_INIT_AUTOMAKE([foreign -Wall -W]) AM_INIT_AUTOMAKE([foreign -Wall -W subdir-objects])
AM_SILENT_RULES([yes]) AM_SILENT_RULES([yes])
AC_PROG_CC AC_PROG_CC
AC_LANG(C) AC_LANG(C)
@@ -13,14 +13,11 @@ PKG_CHECK_MODULES([curl], [libcurl])
PKG_CHECK_MODULES([fuse], [fuse]) PKG_CHECK_MODULES([fuse], [fuse])
PKG_CHECK_MODULES([SYSTEMD], [systemd]) PKG_CHECK_MODULES([SYSTEMD], [systemd])
AC_ARG_WITH([systemdunitdir], AC_HELP_STRING([--with-systemdunitdir=DIR], tmpfilesdir=`pkg-config --variable tmpfilesdir systemd`
[path to systemd service directory]), [path_systemdunit=${withval}], AC_SUBST(tmpfilesdir)
[path_systemdunit="`$PKG_CONFIG --variable=systemdsystemunitdir systemd`"])
if (test -n "${path_systemdunit}"); then systemdsystemunitdir=`pkg-config --variable systemdsystemunitdir systemd`
SYSTEMD_UNITDIR="${path_systemdunit}" AC_SUBST(systemdsystemunitdir)
AC_SUBST(SYSTEMD_UNITDIR)
AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}")
fi
AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([Makefile])
AC_OUTPUT AC_OUTPUT
+6 -2
View File
@@ -222,11 +222,11 @@ int main(int argc, char **argv)
int sockfd; int sockfd;
struct sockaddr_un sun; struct sockaddr_un sun;
int ret; int ret;
int curl_done = 0;
if (argc < -1) if (argc < -1)
(void)argv; (void)argv;
curl_global_init(CURL_GLOBAL_ALL);
signal(SIGPIPE,SIG_IGN); signal(SIGPIPE,SIG_IGN);
@@ -235,7 +235,6 @@ int main(int argc, char **argv)
if (access("/var/cache/debuginfo/src/", F_OK)) if (access("/var/cache/debuginfo/src/", F_OK))
system("mkdir -p /var/cache/debuginfo/src/ &> /dev/null"); system("mkdir -p /var/cache/debuginfo/src/ &> /dev/null");
sockfd = socket(AF_UNIX, SOCK_STREAM, 0); sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
if (sockfd < 0) if (sockfd < 0)
return EXIT_FAILURE; return EXIT_FAILURE;
@@ -261,6 +260,11 @@ int main(int argc, char **argv)
pthread_t thread; pthread_t thread;
clientsock = accept(sockfd, NULL, NULL); clientsock = accept(sockfd, NULL, NULL);
if (!curl_done) {
curl_global_init(CURL_GLOBAL_ALL);
curl_done = 1;
}
pthread_create(&thread, NULL, server_thread, (void *)(unsigned long)clientsock); pthread_create(&thread, NULL, server_thread, (void *)(unsigned long)clientsock);
pthread_detach(thread); pthread_detach(thread);