#include "main.h"
#include <signal.h>
#include <setjmp.h>
+#include <sys/time.h>
+#include "cabinet-memory.h"
#include <captive/macros.h>
/* Config: */
#define ACQUIRE_CABINET_READ_RAW_READ_TRY_MAX 5
#define ACQUIRE_CABINET_READ_RAW_READ_TIMEOUT 20
+#define ACQUIRE_CABINET_READ_RAW_READ_ITER_SEC 0
+#define ACQUIRE_CABINET_READ_RAW_READ_ITER_USEC 100000
+
+
+#define ACQUIRE_CABINET_READ_RAW_READ_TIMEOUT_ITERS \
+ ((ACQUIRE_CABINET_READ_RAW_READ_TIMEOUT *1000000LL) \
+ /(ACQUIRE_CABINET_READ_RAW_READ_ITER_SEC*1000000LL+ACQUIRE_CABINET_READ_RAW_READ_ITER_USEC))
void acquire_cabinet_seek(struct acquire_cabinet *acquire_cabinet,GnomeVFSFileOffset offset)
return acquire_cabinet->offset;
}
-static gboolean handler_SIGALRM_hit;
+static guint handler_SIGALRM_hits;
static sigjmp_buf handler_SIGALRM_sigjmp_buf;
static void handler_SIGALRM(int signo)
* and we will abort it after 1 second. OK, some data may be read that time
* but who cares.
*/
- if (!handler_SIGALRM_hit) {
- handler_SIGALRM_hit=TRUE;
- alarm(1);
+ if (handler_SIGALRM_hits++<ACQUIRE_CABINET_READ_RAW_READ_TIMEOUT_ITERS
+ && !(*ui_progress)(NULL))
return;
- }
siglongjmp(handler_SIGALRM_sigjmp_buf,1); /* 1; meaning: !=0 */
}
/* FIXME: This is hack.
* Correct way would be to use 'GnomeVFSCancellation'
* to abort 'GnomeVFSInetConnection' acting as 'GnomeVFSSocket'.
- * This abort should be handled from 'http'/'httpcaptive' handler
+ * This abort should be handled from 'http' handler
* but gnome_vfs_cancellation_cancel() cannot be invoked from
* the asynchronous slave thread.
*/
while (try++<=ACQUIRE_CABINET_READ_RAW_READ_TRY_MAX) {
GnomeVFSResult errvfsresult;
-unsigned erruint;
GnomeVFSHandle *handle_new;
struct sigaction oldact;
int errint;
+struct itimerval itimerval;
+GnomeVFSFileSize offset_current;
if ((*ui_progress)(NULL))
return GNOME_VFS_ERROR_INTERRUPTED;
if (!sigsetjmp(
handler_SIGALRM_sigjmp_buf, /* env */
TRUE)) { /* savesigs */
- handler_SIGALRM_hit=FALSE;
+ handler_SIGALRM_hits=0;
errint=sigaction(
SIGALRM, /* signum */
NULL, /* act */
&oldact); /* oldact */
g_assert(errint==0);
signal(SIGALRM,handler_SIGALRM);
- erruint=alarm(ACQUIRE_CABINET_READ_RAW_READ_TIMEOUT);
- g_assert(erruint==0);
- errvfsresult=gnome_vfs_seek(acquire_cabinet->handle,GNOME_VFS_SEEK_START,offset);
+ itimerval.it_interval.tv_sec=ACQUIRE_CABINET_READ_RAW_READ_ITER_SEC;
+ itimerval.it_interval.tv_usec=ACQUIRE_CABINET_READ_RAW_READ_ITER_USEC;
+ itimerval.it_value=itimerval.it_interval;
+ errint=setitimer(
+ ITIMER_REAL, /* which */
+ &itimerval, /* value */
+ NULL); /* ovalue */
+ g_assert(errint==0);
+ /* Optimization avoid resetting connection
+ * in neon "http" handler of: FC4 gnome-vfs2-2.10.0-5
+ * http://bugzilla.gnome.org/show_bug.cgi?id=324984
+ */
+ errvfsresult=gnome_vfs_tell(*acquire_cabinet->handlep,&offset_current);
+ if (GNOME_VFS_OK==errvfsresult && (GnomeVFSFileOffset)offset_current!=offset)
+ errvfsresult=gnome_vfs_seek(*acquire_cabinet->handlep,GNOME_VFS_SEEK_START,offset);
if (GNOME_VFS_OK==errvfsresult)
- errvfsresult=gnome_vfs_read(acquire_cabinet->handle,buffer,bytes,bytes_read);
+ errvfsresult=gnome_vfs_read(*acquire_cabinet->handlep,buffer,bytes,bytes_read);
}
else
errvfsresult=GNOME_VFS_ERROR_INTERRUPTED;
- alarm(0);
+ itimerval.it_interval.tv_sec=0;
+ itimerval.it_interval.tv_usec=0;
+ itimerval.it_value=itimerval.it_interval;
+ errint=setitimer(
+ ITIMER_REAL, /* which */
+ &itimerval, /* value */
+ NULL); /* ovalue */
+ g_assert(errint==0);
errint=sigaction(
SIGALRM, /* signum */
&oldact, /* act */
return GNOME_VFS_OK;
}
- /* Reopen 'acquire_cabinet->handle' */
-
+ /* Reopen '*acquire_cabinet->handlep' */
g_assert(acquire_cabinet->handle_uri!=NULL);
- if (GNOME_VFS_OK==(errvfsresult=gnome_vfs_open_uri(&handle_new,acquire_cabinet->handle_uri,GNOME_VFS_OPEN_READ))) {
- gnome_vfs_close(acquire_cabinet->handle); /* errors ignored */
- acquire_cabinet->handle=handle_new;
+ if (GNOME_VFS_OK==(errvfsresult=gnome_vfs_open_uri(&handle_new,acquire_cabinet->handle_uri,
+ GNOME_VFS_OPEN_READ|GNOME_VFS_OPEN_RANDOM))) {
+ gnome_vfs_close(*acquire_cabinet->handlep); /* errors ignored */
+ *acquire_cabinet->handlep=handle_new;
}
}
r->base=(/* de-const */ gpointer)file_base;
r->base_cached=NULL;
r->offset=0;
- r->handle=NULL;
+ r->handlep=NULL;
r->size=file_length;
acquire_cabinet_set_uri(r,uri);
r->cabinet_done=0;
r->cabinet_used=cabinet_used;
+ r->memory=acquire_cabinet_memory_object_new();
return r;
}
struct acquire_cabinet *acquire_cabinet_new_from_handle
- (GnomeVFSHandle *handle,GnomeVFSFileInfo *file_info,GnomeVFSURI *uri,gint cabinet_used)
+ (GnomeVFSHandle **handlep,GnomeVFSFileInfo *file_info,GnomeVFSURI *uri,gint cabinet_used)
{
struct acquire_cabinet *r;
- g_return_val_if_fail(handle!=NULL,NULL);
+ g_return_val_if_fail(handlep!=NULL,NULL);
+ g_return_val_if_fail(*handlep!=NULL,NULL);
g_return_val_if_fail(file_info!=NULL,NULL);
g_return_val_if_fail(uri!=NULL,NULL);
}
captive_new0n(r->base_cached,CAPTIVE_ROUND_UP64(file_info->size,8)/8);
r->offset=0;
- r->handle=handle;
+ r->handlep=handlep;
r->size=file_info->size;
- acquire_cabinet_set_uri(r,uri);
r->cabinet_done=0;
r->cabinet_used=cabinet_used;
+ acquire_cabinet_set_uri(r,uri);
+ r->memory=acquire_cabinet_memory_object_new();
+
return r;
}
g_free((/* de-const */ gchar *)acquire_cabinet->filename);
gnome_vfs_uri_unref(acquire_cabinet->uri);
gnome_vfs_uri_unref(acquire_cabinet->handle_uri);
+ g_object_unref(acquire_cabinet->memory);
g_free(acquire_cabinet);
}
if ((*ui_progress)(acquire_cabinet->uri))
return;
+ acquire_cabinet_memory_object_push(acquire_cabinet->memory);
+
basecab=find_cabs_in_file(acquire_cabinet);
if (!basecab)
- return;
+ goto fail_memory_pop;
if (basecab->next)
- return;
+ goto fail_memory_pop;
if (basecab->prevcab || basecab->nextcab)
- return;
+ goto fail_memory_pop;
filelist=process_files(basecab);
uri_fi=gnome_vfs_uri_append_file_name(acquire_cabinet->uri,fi->filename);
if ((*ui_progress)(uri_fi)) {
gnome_vfs_uri_unref(uri_fi);
- return;
+ goto fail_memory_pop;
}
file_write_fi_assertion=fi;
TRUE); /* free_segment */
gnome_vfs_uri_unref(uri_fi);
if (!errint)
- return;
+ goto fail_memory_pop;
continue;
}
file_buffer=g_byte_array_free(file_write_bytearray,
gnome_vfs_uri_unref(uri_fi);
g_free(file_buffer);
}
+
+ /* FALLTHRU */
+
+fail_memory_pop:
+ acquire_cabinet_memory_object_pop(acquire_cabinet->memory);
}
git://git.jankratochvil.net / captive.git / blobdiff