allow service to start early

Bump v38 to resync configure + tags
Signed-off-by: Ikey Doherty <michael.i.doherty@intel.com>
2026-09-06 05:41:43 +00:00 · 2017-05-07 15:42:30 +00:00 · 2017-03-09 17:48:59 +00:00 · 2017-03-09 17:46:10 +00:00 · 2017-03-09 15:44:09 +00:00 · 2017-03-09 15:38:29 +00:00
7 changed files with 27 additions and 10 deletions
@@ -4,6 +4,7 @@ Description=Clear Linux debuginfo daemon
 [Service]
 Type=simple
 ExecStart=/usr/bin/clr_debug_daemon
+DefaultDependencies=no

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

 [Install]
 WantedBy=multi-user.target
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ([2.66])
-AC_INIT(clr-debug-info, 32, arjan@linux.intel.com)
+AC_INIT(clr-debug-info, 38, arjan@linux.intel.com)
 AM_INIT_AUTOMAKE([foreign -Wall -W subdir-objects])
 AM_SILENT_RULES([yes])
 AC_PROG_CC
@@ -85,6 +85,7 @@ 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;
@@ -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;
-                        break;
+                        goto end;
                }
                if (write(dest_fd, buffer, sizeof(buffer)) != r) {
                        break;
@@ -123,8 +123,8 @@ static inline unsigned nc_hashmap_get_hash(NcHashmap *self, const void *key)
        return hash;
 }

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

@@ -189,6 +189,19 @@ 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);
@@ -224,7 +237,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  -xf %s",
+                             "tar -C /var/cache/debuginfo/%s --no-same-owner  --no-same-permissions  -xf %s",
                             prefix,
                             filename) >= 0) {
                        if (system(command) != 0) {
@@ -269,7 +282,6 @@ static void *server_thread(void *arg)
        if (ret < 0) {
                goto thread_end;
        }
-        prefix = buf;
        c = strchr(buf, ':');
        if (!c) {
                goto thread_end;
@@ -322,7 +334,7 @@ static void *server_thread(void *arg)
        }

        gettimeofday(&after, NULL);
-#If 0        
+#if 0        
        if (timedelta(before, after) > 0.6)
                printf("Request for %s took %5.2f seconds (%i - %i)\n",
                       url,
Author	SHA1	Message	Date
Arjan van de Ven	be8a99da53	allow service to start early	2017-05-07 15:42:30 +00:00
Ikey Doherty	c9304402e2	Bump v38 to resync configure + tags Signed-off-by: Ikey Doherty <michael.i.doherty@intel.com>	2017-03-09 17:48:59 +00:00
Ikey Doherty	6e202f13f7	Bump v34 Signed-off-by: Ikey Doherty <michael.i.doherty@intel.com>	2017-03-09 17:46:10 +00:00
Ikey Doherty	6735f8f6ed	nica/files: Ensure we really do break on a read error Previously nc_copy_file would return true regardless of a source read error, flagged in analysis. Ensure we bypass the set of ret to true and return the correct value in all instances. Signed-off-by: Ikey Doherty <michael.i.doherty@intel.com>	2017-03-09 15:44:09 +00:00
Ikey Doherty	8b3777ab99	server: Remove useless assignment of prefix This particular assignment is never used, as if this path fails, we go to the thread end. We then reassign prefix after we split the input string. Signed-off-by: Ikey Doherty <michael.i.doherty@intel.com>	2017-03-09 15:38:29 +00:00
Ikey Doherty	84350939ef	nica/hashmap: Fix signature issue & item dereference The signature was incorrect for inserting buckets, as we used an int, not a boolean. Another issue resolved with this change is the potential dereferencing of a null pointer by not having checked first if item was NULL when setting the next pointer. Signed-off-by: Ikey Doherty <michael.i.doherty@intel.com>	2017-03-09 15:35:29 +00:00
Arjan van de Ven	72b1120a40	add --no-same-permissions as well	2017-03-09 14:52:37 +00:00
Auke Kok	d3d5fab301	Tag v33	2016-11-01 09:20:19 -07:00
Auke Kok	e377433a9d	Return on error here too. Missed a 'return' catching an error.	2016-11-01 09:15:12 -07:00
Auke Kok	afa92c77b1	Add reasonable connection timeout limits. Adds a 30second connection timeout, and a low bandwith timeout value (at 1kb/sec over 30 seconds) where the attempt will fail. This provides some feedback to users that network issues are preventing debug info from being loaded.	2016-11-01 09:15:12 -07:00
Arjan van de Ven	a01ce4c329	dumb down due to limited infra	2016-11-01 13:17:49 +00:00
Arjan van de Ven	1eaaac582c	use http/2	2016-11-01 12:56:35 +00:00