Release v32

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, 32, arjan@linux.intel.com)
 AM_INIT_AUTOMAKE([foreign -Wall -W subdir-objects])
 AM_SILENT_RULES([yes])
 AC_PROG_CC

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

@@ -55,8 +55,8 @@
 
 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;
@@ -189,19 +189,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 +224,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 +269,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 +322,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 +329,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);