X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=src%2Finstall%2Facquire%2Fcabinet.c;h=3967631e2202b7cf67b86c51ea22ff7c6c149d8e;hb=a2dd38f86df22c46ae18f3ad7d9850eaacb02b92;hp=71170abc8e06f8d5ed4b37fdf182ffc4ced49367;hpb=6bdd3c7c6231cab410075e3d760f3c76b9163e8f;p=captive.git diff --git a/src/install/acquire/cabinet.c b/src/install/acquire/cabinet.c index 71170ab..3967631 100644 --- a/src/install/acquire/cabinet.c +++ b/src/install/acquire/cabinet.c @@ -31,6 +31,8 @@ #include "main.h" #include #include +#include +#include "cabinet-memory.h" #include @@ -38,6 +40,13 @@ /* 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) @@ -70,7 +79,7 @@ GnomeVFSFileOffset acquire_cabinet_tell(struct acquire_cabinet *acquire_cabinet) 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) @@ -83,11 +92,9 @@ 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++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 */ @@ -153,12 +180,12 @@ int errint; 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; } } @@ -264,21 +291,23 @@ struct acquire_cabinet *r; 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); @@ -296,12 +325,14 @@ struct acquire_cabinet *r; } 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; } @@ -316,6 +347,7 @@ void acquire_cabinet_free(struct acquire_cabinet *acquire_cabinet) 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); } @@ -351,13 +383,15 @@ struct file *filelist,*fi; 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); @@ -372,7 +406,7 @@ int errint; 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; @@ -387,7 +421,7 @@ int errint; 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, @@ -396,4 +430,9 @@ int errint; gnome_vfs_uri_unref(uri_fi); g_free(file_buffer); } + + /* FALLTHRU */ + +fail_memory_pop: + acquire_cabinet_memory_object_pop(acquire_cabinet->memory); }