Changeset 0b2ea3de7ef423f322aa569a956bbe404cbaed99

Timestamp:

06/25/08 22:44:53 (2 months ago)

Author:

Rémi Duraffort <ivoire@videolan.org>

git-committer:

Rémi Duraffort <ivoire@videolan.org> 1214426693 +0200

git-parent:

[6f25cb79f46b9c5e6069beba37abbd2b4e4efd06]

git-author:

Rémi Duraffort <ivoire@videolan.org> 1214423660 +0200

Message:

Fix the update system, based on funman patch + some modifications.

Files:

• src/misc/update.c (modified) (9 diffs)
• src/misc/update.h (modified) (2 diffs)

src/misc/update.c

@@ -1050 +1050 @@
-    p_update->release.psz_desc = NULL;
-
+    p_update->p_download = NULL;
+    p_update->p_check = NULL;
+
-    p_update->p_pkey = NULL;
-    vlc_gcrypt_init();
@@ -1066 +1069 @@
-    assert( p_update );
-
+    vlc_mutex_lock( &p_update->lock );
+
+    if( p_update->p_check )
+    {
+        assert( !p_update->p_download );
+        vlc_object_kill( p_update->p_check );
+        vlc_thread_join( p_update->p_check );
+    }
+    else if( p_update->p_download )
+    {
+        vlc_object_kill( p_update->p_download );
+        vlc_thread_join( p_update->p_download );
+    }
+
+    vlc_mutex_unlock( &p_update->lock );
-    vlc_mutex_destroy( &p_update->lock );
-
@@ -1337 +1355 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-/**
@@ -1368 +1374 @@
-
-    p_uct->p_update = p_update;
+    p_update->p_check = p_uct;
-    p_uct->pf_callback = pf_callback;
-    p_uct->p_data = p_data;
@@ -1386 +1393 @@
-    if( p_uct->pf_callback )
-        (p_uct->pf_callback)( p_uct->p_data, b_ret );
+
+    p_uct->p_update->p_check = NULL;
+
+    vlc_object_release( p_uct );
-}
-
@@ -1426 +1437 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-/**
@@ -1456 +1456 @@
-
-    p_udt->p_update = p_update;
+    p_update->p_download = p_udt;
-    p_udt->psz_destdir = psz_destdir ? strdup( psz_destdir ) : NULL;
-
@@ -1462 +1463 @@
-}
-
-
+static 
-{
-    int i_progress = 0;
@@ -1653 +1654 @@
-    free( p_buffer );
-    free( psz_size );
+
+    p_udt->p_update->p_download = NULL;
+
+    vlc_object_release( p_udt );
-}
-

src/misc/update.h

@@ -144 +144 @@
-
-/**
+ * Non blocking binary download
+ */
+typedef struct
+{
+    VLC_COMMON_MEMBERS
+    update_t *p_update;
+    char *psz_destdir;
+} update_download_thread_t;
+
+/**
+ * Non blocking update availability verification
+ */
+typedef struct
+{
+    VLC_COMMON_MEMBERS
+    update_t *p_update;
+    void (*pf_callback)( void *, bool );
+    void *p_data;
+} update_check_thread_t;
+/**
- * The update object. Stores (and caches) all information relative to updates
- */
@@ -152 +172 @@
-    struct update_release_t release;    ///< Release (version)
-    public_key_t *p_pkey;
+    update_download_thread_t *p_download;
+    update_check_thread_t *p_check;
-};
-