Release v31

Signed-off-by: Ikey Doherty <michael.i.doherty@intel.com>

clr_debug_daemon.service

@@ -4,8 +4,6 @@ Description=Clear Linux debuginfo daemon
 [Service]
 Type=simple
 ExecStart=/usr/bin/clr_debug_daemon
-DefaultDependencies=no
-Nice=10
 
 [Install]
 WantedBy=multi-user.target

clr_debug_fuse.service

@@ -5,8 +5,6 @@ After=clr_debug_daemon.service
 [Service]
 Type=simple
 ExecStart=/usr/bin/clr_debug_fuse
-DefaultDependencies=no
-Nice=10
 
 [Install]
 WantedBy=multi-user.target

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.66])
-AC_INIT(clr-debug-info, 38, arjan@linux.intel.com)
+AC_INIT(clr-debug-info, 31, arjan@linux.intel.com)
 AM_INIT_AUTOMAKE([foreign -Wall -W subdir-objects])
 AM_SILENT_RULES([yes])
 AC_PROG_CC
@@ -27,32 +27,5 @@ AC_ARG_WITH([systemdtmpfilesdir], AS_HELP_STRING([--with-systemdtmpfilesdir=DIR]
 test -z "${dir}" && dir=/usr/lib/tmpfiles.d
 AC_SUBST(tmpfilesdir, [${dir}])
 
-AC_CHECK_HEADER([stdatomic.h], [have_atomics="yes"], [have_atomics="no"])
-if test x$have_atomics = "xyes"; then
-        AC_DEFINE([HAVE_ATOMIC_SUPPORT], [1], [stdatomic supported by compiler])
-else
-        AC_MSG_WARN([C11 stdatomic support unavailable. Falling back to slow mutex])
-fi
-
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
-
-AC_MSG_RESULT([
-        clr-debuginfo $VERSION
-
-        prefix:                 ${prefix}
-        libdir:                 ${libdir}
-        sysconfdir:             ${sysconfdir}
-        exec_prefix:            ${exec_prefix}
-        bindir:                 ${bindir}
-        datarootdir:            ${datarootdir}
-
-        compiler:               ${CC}
-        cflags:                 ${CFLAGS}
-        ldflags:                ${LDFLAGS}
-
-        systemd-unit-dir:       ${systemdsystemunitdir}
-        tmpfiles.d:             ${tmpfilesdir}
-
-        C11 stdatomic support:  ${have_atomics}
-])

src/client.c

@@ -85,7 +85,6 @@ void try_to_get(const char *path, int pid, time_t timestamp)
         if (ret == 0 && cred.pid == pid) {
                 printf("Recursion\n");
                 close(sockfd);
-                return;
         }
 
         command = NULL;

src/nica/files.c

@@ -113,7 +113,7 @@ bool nc_copy_file(const char *src, const char *dst, mode_t mode, bool remove_tar
         while (true) {
                 if ((r = read(src_fd, &buffer, sizeof(buffer))) < 0) {
                         ret = false;
-                        goto end;
+                        break;
                 }
                 if (write(dest_fd, buffer, sizeof(buffer)) != r) {
                         break;

src/nica/hashmap.c

@@ -123,8 +123,8 @@ static inline unsigned nc_hashmap_get_hash(NcHashmap *self, const void *key)
         return hash;
 }
 
-static int nc_hashmap_insert_bucket(NcHashmap *self, NcHashmapEntry *buckets, int n_buckets,
+static bool nc_hashmap_insert_bucket(NcHashmap *self, NcHashmapEntry *buckets, int n_buckets,
-                                    unsigned hash, const void *key, void *value)
+                                     unsigned hash, const void *key, void *value)
 {
         NcHashmapEntry *row = &(buckets[hash % n_buckets]);
         NcHashmapEntry *head = NULL;
@@ -458,12 +458,10 @@ bool nc_hashmap_iter_next(NcHashmapIter *citer, void **key, void **value)
                         }
                         item = &(map->buckets[iter->bucket]);
                 }
-                if (item) {
+                if (item && item->occ) {
-                        if (item->occ) {
+                        goto success;
-                                goto success;
-                        }
-                        item = item->next;
                 }
+                item = item->next;
         }
         return false;
 

src/server.c

@@ -27,15 +27,14 @@
 #define _GNU_SOURCE
 
 #include <errno.h>
-#include <linux/capability.h>
 #include <malloc.h>
 #include <pthread.h>
 #include <signal.h>
+#include <stdatomic.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/prctl.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -47,22 +46,18 @@
 
 #include <curl/curl.h>
 
-#include "config.h"
-
-#ifdef HAVE_ATOMIC_SUPPORT
-#include <stdatomic.h>
-#endif
-
 static pthread_mutex_t dupes_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-char *urls[2] = { "https://cdn.download.clearlinux.org/debuginfo/",
+char *urls[2] = { "https://debuginfo.clearlinux.org/debuginfo/",
-                  "https://cdn.download.clearlinux.org/debuginfo/" };
+                  "https://debuginfo.clearlinux.org/debuginfo/" };
 int urlcounter = 1;
 
 static NcHashmap *hash = NULL;
 
 #define MAX_CONNECTIONS 16
 
+static atomic_int current_connection_count = 0;
+
 static int avoid_dupes(const char *url)
 {
         int retval = 0;
@@ -90,10 +85,6 @@ static int avoid_dupes(const char *url)
         return retval;
 }
 
-#ifdef HAVE_ATOMIC_SUPPORT
-
-static atomic_int current_connection_count = 0;
-
 /**
  * Get the current connection count atomically
  */
@@ -117,46 +108,6 @@ __nc_inline__ static inline void dec_connection_count(void)
 {
         atomic_fetch_sub(&current_connection_count, 1);
 }
-#else /* HAVE_ATOMIC_SUPPORT */
-
-static int current_connection_count = 0;
-
-/* No stdatomic compiler support, fallback to pthread mutex (slower) */
-pthread_mutex_t con_count_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-/**
- * Get the current connection count via mutex
- */
-__nc_inline__ static inline int get_current_connection_count(void)
-{
-        int r;
-        pthread_mutex_lock(&con_count_mutex);
-        r = current_connection_count;
-        pthread_mutex_unlock(&con_count_mutex);
-        return r;
-}
-
-/**
- * Increment the connection counter via mutex
- */
-__nc_inline__ static inline void inc_connection_count(void)
-{
-        pthread_mutex_lock(&con_count_mutex);
-        current_connection_count++;
-        pthread_mutex_unlock(&con_count_mutex);
-}
-
-/**
- * Decrement the connection counter via mutex
- */
-__nc_inline__ static inline void dec_connection_count(void)
-{
-        pthread_mutex_lock(&con_count_mutex);
-        current_connection_count--;
-        pthread_mutex_unlock(&con_count_mutex);
-}
-
-#endif /* !(HAVE_ATOMIC_SUPPORT) */
 
 static int curl_get_file(const char *url, const char *prefix, time_t timestamp)
 {
@@ -189,19 +140,6 @@ static int curl_get_file(const char *url, const char *prefix, time_t timestamp)
 
         curl_easy_setopt(curl, CURLOPT_URL, url);
         curl_easy_setopt(curl, CURLOPT_WRITEDATA, file);
-        curl_easy_setopt(curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_0);
-
-        /*
-         * Some sane timeout values to prevent stalls
-         *
-         * Connect timeout is for first connection to the server.
-         * The low speed timeout is for slow downloads. Since many
-         * files are several mB large, we want to prevent them from
-         * taking forever. (1kB/sec avg over 30secs).
-         */
-        curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 30);
-        curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, 30);
-        curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, 1024);
 
         if (timestamp) {
                 curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE);
@@ -237,7 +175,7 @@ static int curl_get_file(const char *url, const char *prefix, time_t timestamp)
                 stat(filename, &statbuf);
                 if (statbuf.st_size > 0 &&
                     asprintf(&command,
-                             "tar -C /var/cache/debuginfo/%s --no-same-owner  --no-same-permissions  -xf %s",
+                             "tar -C /var/cache/debuginfo/%s --no-same-owner  -xf %s",
                              prefix,
                              filename) >= 0) {
                         if (system(command) != 0) {
@@ -282,6 +220,7 @@ static void *server_thread(void *arg)
         if (ret < 0) {
                 goto thread_end;
         }
+        prefix = buf;
         c = strchr(buf, ':');
         if (!c) {
                 goto thread_end;
@@ -334,7 +273,6 @@ static void *server_thread(void *arg)
         }
 
         gettimeofday(&after, NULL);
-#if 0        
         if (timedelta(before, after) > 0.6)
                 printf("Request for %s took %5.2f seconds (%i - %i)\n",
                        url,
@@ -342,7 +280,7 @@ static void *server_thread(void *arg)
                            (1.0 * after.tv_usec - before.tv_usec) / 1000000.0,
                        ret,
                        (int)timestamp);
-#endif
+
         /* tell the other side we're done with the download */
         wr = write(fd, "ok", 3);
 
@@ -362,18 +300,6 @@ int main(__nc_unused__ int argc, __nc_unused__ char **argv)
         int curl_done = 0;
         const char *required_paths[] = { "/var/cache/debuginfo/lib", "/var/cache/debuginfo/src" };
 
-        if (prctl(PR_SET_DUMPABLE, 0) != 0) {
-                fprintf(stderr,
-                        "Failed to disable PR_SET_DUMPABLE. Do NOT gdb attach this process: %s\n",
-                        strerror(errno));
-        }
-
-        if (geteuid() == 0) {
-                if (prctl(PR_CAPBSET_DROP, CAP_SYS_ADMIN) != 0) {
-                        fprintf(stderr, "Failed to drop caps: %s\n", strerror(errno));
-                }
-        }
-
         for (size_t i = 0; i < ARRAY_SIZE(required_paths); i++) {
                 const char *req_path = required_paths[i];
                 if (nc_file_exists(req_path)) {