Changeset 4394

Timestamp:

04/23/08 17:40:38 (5 years ago)

Author:

thomas

Message:

opkg: improve download callback handling and integrate into opkg_update_package_lists

Location:

trunk/src/target/opkg/libopkg

Files:

• opkg.c (modified) (4 diffs)
• opkg_cmd.c (modified) (3 diffs)
• opkg_download.c (modified) (4 diffs)
• opkg_download.h (modified) (1 diff)

trunk/src/target/opkg/libopkg/opkg.c

@@ -88 +88 @@
 }
 
+struct _curl_cb_data
+{
+  opkg_progress_callback_t cb;
+  opkg_t *opkg;
+  void *user_data;
+  int start_range;
+  int finish_range;
+};
+
+int
+curl_progress_cb (struct _curl_cb_data *cb_data,
+                    double t, /* dltotal */
+                    double d, /* dlnow */
+                    double ultotal,
+                    double ulnow)
+{
+  int p = (t) ? d*100/t : 0;
+  static int prev = -1;
+
+  /* prevent the same value being sent twice (can occur due to rounding) */
+  if (p == prev)
+    return 0;
+  prev = p;
+
+  if (t < 1)
+    return 0;
+
+  (cb_data->cb) (cb_data->opkg,
+      cb_data->start_range + (d/t * ((cb_data->finish_range - cb_data->start_range))),
+      cb_data->user_data);
+
+  return 0;
+}
 
 
@@ -457 +490 @@
       char *tmp_file_name;
       FILE *in, *out;
+      struct _curl_cb_data cb_data;
 
       sprintf_alloc (&tmp_file_name, "%s/%s.gz", tmp, src->name);
 
       /* XXX: Note: downloading url */
-      err = opkg_download (opkg->conf, url, tmp_file_name);
+
+      cb_data.cb = progress_callback;
+      cb_data.opkg = opkg;
+      cb_data.user_data = user_data;
+      cb_data.start_range = 100 * sources_done / sources_list_count;
+      cb_data.finish_range = 100 * (sources_done + 1) / sources_list_count;
+
+      err = opkg_download (opkg->conf, url, tmp_file_name, (curl_progress_func) curl_progress_cb, &cb_data);
 
       if (err == 0)
@@ -480 +521 @@
     }
     else
-      err = opkg_download (opkg->conf, url, list_file_name);
+      err = opkg_download (opkg->conf, url, list_file_name, NULL, NULL);
 
     if (err)
@@ -502 +543 @@
     sprintf_alloc (&tmp_file_name, "%s/%s", tmp, "Packages.sig");
 
-    err = opkg_download (opkg->conf, url, tmp_file_name);
+    err = opkg_download (opkg->conf, url, tmp_file_name, NULL, NULL);
     if (err)
     {

trunk/src/target/opkg/libopkg/opkg_cmd.c

@@ -227 +227 @@
               
               sprintf_alloc (&tmp_file_name, "%s/%s.gz", tmp, src->name);
-              err = opkg_download(conf, url, tmp_file_name);
+              err = opkg_download(conf, url, tmp_file_name, NULL, NULL);
               if (err == 0) {
                    opkg_message (conf, OPKG_NOTICE, "Inflating %s\n", url);
@@ -243 +243 @@
               }
           } else
-              err = opkg_download(conf, url, list_file_name);
+              err = opkg_download(conf, url, list_file_name, NULL, NULL);
           if (err) {
                failures++;
@@ -267 +267 @@
           sprintf_alloc (&tmp_file_name, "%s/%s", tmp, "Packages.sig");
 
-          err = opkg_download(conf, url, tmp_file_name);
+          err = opkg_download(conf, url, tmp_file_name, NULL, NULL);
           if (err) {
             failures++;

trunk/src/target/opkg/libopkg/opkg_download.c

@@ -34 +34 @@
 #include "opkg_defines.h"
 
-opkg_download_progress_callback opkg_cb_download_progress = NULL;
-
-int
-curl_progress_func (char* url,
-                    double t, /* dltotal */
-                    double d, /* dlnow */
-                    double ultotal,
-                    double ulnow)
-{
-    int p = (t) ? d*100/t : 0;
-
-    if (opkg_cb_download_progress)
-    {
-        static int prev = -1;
-
-        /* don't report the same percentage multiple times
-         * (this can occur due to rounding) */
-        if (prev == p)
-            return 0;
-        prev = p;
-
-        opkg_cb_download_progress (p, url);
-        return 0;
-    }
-    return 0;
-}
-
-int opkg_download(opkg_conf_t *conf, const char *src, const char *dest_file_name)
+int opkg_download(opkg_conf_t *conf, const char *src, const char *dest_file_name, curl_progress_func cb, void *data)
 {
     int err = 0;
@@ -111 +84 @@
         curl_easy_setopt (curl, CURLOPT_URL, src);
         curl_easy_setopt (curl, CURLOPT_WRITEDATA, file);
-        curl_easy_setopt (curl, CURLOPT_NOPROGRESS, 0);
-        curl_easy_setopt (curl, CURLOPT_PROGRESSDATA, src);
-        curl_easy_setopt (curl, CURLOPT_PROGRESSFUNCTION, curl_progress_func);
+        curl_easy_setopt (curl, CURLOPT_NOPROGRESS, (cb == NULL));
+        if (cb)
+        {
+                curl_easy_setopt (curl, CURLOPT_PROGRESSDATA, data);
+                curl_easy_setopt (curl, CURLOPT_PROGRESSFUNCTION, cb);
+        }
         curl_easy_setopt (curl, CURLOPT_FAILONERROR, 1);
         if (conf->http_proxy || conf->ftp_proxy)
@@ -180 +156 @@
     sprintf_alloc(&pkg->local_filename, "%s/%s", dir, stripped_filename);
 
-    err = opkg_download(conf, url, pkg->local_filename);
+    err = opkg_download(conf, url, pkg->local_filename, NULL, NULL);
     free(url);
 
@@ -205 +181 @@
 
           sprintf_alloc(&tmp_file, "%s/%s", conf->tmp_dir, file_base);
-          err = opkg_download(conf, url, tmp_file);
+          err = opkg_download(conf, url, tmp_file, NULL, NULL);
           if (err)
                return err;

trunk/src/target/opkg/libopkg/opkg_download.h

@@ -22 +22 @@
 
 typedef void (*opkg_download_progress_callback)(int percent, char *url);
+typedef int (*curl_progress_func)(void *data, double t, double d, double ultotal, double ulnow);
 
-int opkg_download(opkg_conf_t *conf, const char *src, const char *dest_file_name);
+
+int opkg_download(opkg_conf_t *conf, const char *src, const char *dest_file_name, curl_progress_func cb, void *data);
 int opkg_download_pkg(opkg_conf_t *conf, pkg_t *pkg, const char *dir);
 /*