Framework for dealing with blocking MojoInputs.

icculus · May 7, 2007 · 336b7ea · 336b7ea
1 parent e671e16
commit 336b7ea
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 4 deletions.
diff --git a/archive_tar.c b/archive_tar.c
@@ -39,6 +39,10 @@ static void initializeZStream(z_stream *pstr)
     pstr->zfree = mojoZlibFree;
 } // initializeZStream
 
+static boolean MojoInput_gzip_ready(MojoInput *io)
+{
+    return true;
+} // MojoInput_gzip_ready
 
 static boolean MojoInput_gzip_seek(MojoInput *io, uint64 offset)
 {
@@ -182,6 +186,7 @@ static MojoInput *make_gzip_input(MojoInput *origio)
     info->buffer = (uint8 *) xmalloc(GZIP_READBUFSIZE);
 
     io = (MojoInput *) xmalloc(sizeof (MojoInput));
+    io->ready = MojoInput_gzip_ready;
     io->read = MojoInput_gzip_read;
     io->seek = MojoInput_gzip_seek;
     io->tell = MojoInput_gzip_tell;
@@ -229,6 +234,10 @@ static void initializeBZ2Stream(bz_stream *pstr)
     pstr->bzfree = mojoBzlib2Free;
 } // initializeBZ2Stream
 
+static boolean MojoInput_bzip2_ready(MojoInput *io)
+{
+    return true;
+} // MojoInput_bzip2_ready
 
 static boolean MojoInput_bzip2_seek(MojoInput *io, uint64 offset)
 {
@@ -385,6 +394,7 @@ static MojoInput *make_bzip2_input(MojoInput *origio)
     info->buffer = (uint8 *) xmalloc(BZIP2_READBUFSIZE);
 
     io = (MojoInput *) xmalloc(sizeof (MojoInput));
+    io->ready = MojoInput_bzip2_ready;
     io->read = MojoInput_bzip2_read;
     io->seek = MojoInput_bzip2_seek;
     io->tell = MojoInput_bzip2_tell;
@@ -417,6 +427,11 @@ typedef struct TARinfo
     uint64 nextEnumPos;
 } TARinfo;
 
+static boolean MojoInput_tar_ready(MojoInput *io)
+{
+    return true;
+} // MojoInput_tar_ready
+
 static int64 MojoInput_tar_read(MojoInput *io, void *buf, uint32 bufsize)
 {
     TARinput *input = (TARinput *) io->opaque;
@@ -666,6 +681,7 @@ static MojoInput *MojoArchive_tar_openCurrentEntry(MojoArchive *ar)
     opaque->offset = info->curFileStart;
 
     io = (MojoInput *) xmalloc(sizeof (MojoInput));
+    io->ready = MojoInput_tar_ready;
     io->read = MojoInput_tar_read;
     io->seek = MojoInput_tar_seek;
     io->tell = MojoInput_tar_tell;

diff --git a/archive_zip.c b/archive_zip.c
@@ -1664,6 +1664,11 @@ const PHYSFS_Archiver __PHYSFS_Archiver_ZIP =
 
 // MojoInput implementation...
 
+static boolean MojoInput_zip_ready(MojoInput *io)
+{
+    return true;
+} // MojoInput_zip_ready
+
 static int64 MojoInput_zip_read(MojoInput *io, void *buf, uint32 bufsize)
 {
     return ZIP_read(io->opaque, buf, 1, bufsize);
@@ -1758,6 +1763,7 @@ static MojoInput *buildZipMojoInput(ZIPinfo *info, const char *fullpath)
         return NULL;
 
     io = (MojoInput *) xmalloc(sizeof (MojoInput));
+    io->ready = MojoInput_zip_ready;
     io->read = MojoInput_zip_read;
     io->seek = MojoInput_zip_seek;
     io->tell = MojoInput_zip_tell;

diff --git a/fileio.c b/fileio.c
@@ -98,10 +98,9 @@ boolean MojoInput_toPhysicalFile(MojoInput *in, const char *fname, uint16 perms,
     {
         while (!iofailure)
         {
-// !!! FIXME: to be written
-//            if (!in->ready(in))
-//                MojoPlatform_sleep(100);
-//            else
+            if (!in->ready(in))
+                MojoPlatform_sleep(100);
+            else
             {
                 br = in->read(in, scratchbuf_128k, sizeof (scratchbuf_128k));
                 if (br == 0)  // we're done!
@@ -171,6 +170,12 @@ typedef struct
     char *path;
 } MojoInputFileInstance;
 
+static boolean MojoInput_file_ready(MojoInput *io)
+{
+    // !!! FIXME: select()? Does that help with network filesystems?
+    return true;
+} // MojoInput_file_ready
+
 static int64 MojoInput_file_read(MojoInput *io, void *buf, uint32 bufsize)
 {
     MojoInputFileInstance *inst = (MojoInputFileInstance *) io->opaque;
@@ -242,6 +247,7 @@ MojoInput *MojoInput_newFromFile(const char *path)
         inst->handle = f;
 
         io = (MojoInput *) xmalloc(sizeof (MojoInput));
+        io->ready = MojoInput_file_ready;
         io->read = MojoInput_file_read;
         io->seek = MojoInput_file_seek;
         io->tell = MojoInput_file_tell;

diff --git a/fileio.h b/fileio.h
@@ -24,6 +24,7 @@ typedef struct MojoInput MojoInput;
 struct MojoInput
 {
     // public
+    boolean (*ready)(MojoInput *io);
     int64 (*read)(MojoInput *io, void *buf, uint32 bufsize);
     boolean (*seek)(MojoInput *io, uint64 pos);
     int64 (*tell)(MojoInput *io);

diff --git a/libfetch/ftp.c b/libfetch/ftp.c
@@ -508,6 +508,10 @@ static int	 _ftp_closefn(void *);
 
 
 #if __MOJOSETUP__
+static boolean MojoInput_ftp_ready(MojoInput *io)
+{
+    return true;  // !!! FIXME: select on the socket...
+}
 static int64 MojoInput_ftp_tell(MojoInput *v)
 {
 	struct ftpio *io = (struct ftpio *)v->opaque;
@@ -696,6 +700,7 @@ _ftp_setup(conn_t *cconn, conn_t *dconn, int mode)
     io->bytes_read = 0;
     io->length = -1;
     f = (MojoInput *) xmalloc(sizeof (MojoInput));
+    f->ready = MojoInput_ftp_ready;
     f->read = MojoInput_ftp_read;
     f->seek = MojoInput_ftp_seek;
     f->tell = MojoInput_ftp_tell;

diff --git a/libfetch/http.c b/libfetch/http.c
@@ -137,6 +137,10 @@ struct httpio
 
 
 #if __MOJOSETUP__
+static boolean MojoInput_http_ready(MojoInput *io)
+{
+    return true;  // !!! FIXME: select on the socket...
+}
 static boolean MojoInput_http_seek(MojoInput *v, uint64 pos)
 {
     return -1;
@@ -387,6 +391,7 @@ _http_funopen(conn_t *conn, int chunked)
     io->bytes_read = 0;
     io->length = -1;
     f = (MojoInput *) xmalloc(sizeof (MojoInput));
+    f->ready = MojoInput_http_ready;
     f->read = MojoInput_http_read;
     f->seek = MojoInput_http_seek;
     f->tell = MojoInput_http_tell;

diff --git a/platform.h b/platform.h
@@ -66,6 +66,10 @@ void *MojoPlatform_dlopen(const uint8 *img, size_t len);
 void *MojoPlatform_dlsym(void *lib, const char *sym);
 void MojoPlatform_dlclose(void *lib);
 
+// Put the calling process to sleep for at least (ticks) milliseconds.
+//  This is meant to yield the CPU while spinning in a loop that is polling
+//  for input, etc. Pumping the GUI event queue happens elsewhere, not here.
+void MojoPlatform_sleep(uint32 ticks);
 
 // Put a line of text to the the system log, whatever that might be on a
 //  given platform. (str) is a complete line, but won't end with any newline

diff --git a/platform/beos.c b/platform/beos.c
@@ -5,6 +5,7 @@
 
 #include <stdio.h>
 #include <be/kernel/image.h>
+#include <be/kernel/OS.h>
 
 void *beos_dlopen(const char *fname, int unused)
 {
@@ -30,5 +31,11 @@ void beos_dlclose(void *lib)
     unload_add_on((image_id) lib);
 } // beos_dlclose
 
+
+void beos_usleep(unsigned long microseconds)
+{
+    snooze(microseconds);
+} // beos_usleep
+
 // end of beos.c ...
 
diff --git a/platform/unix.c b/platform/unix.c
@@ -32,9 +32,11 @@
 void *beos_dlopen(const char *fname, int unused);
 void *beos_dlsym(void *lib, const char *sym);
 void beos_dlclose(void *lib);
+void beos_usleep(unsigned long ticks);
 #define dlopen beos_dlopen
 #define dlsym beos_dlsym
 #define dlclose beos_dlclose
+#define usleep beos_usleep
 #else
 #include <dlfcn.h>
 #define DLOPEN_ARGS (RTLD_NOW | RTLD_GLOBAL)
@@ -426,6 +428,12 @@ boolean MojoPlatform_osVersion(char *buf, size_t len)
 } // MojoPlatform_osversion
 
 
+void MojoPlatform_sleep(uint32 ticks)
+{
+    usleep(ticks * 1000);
+} // MojoPlatform_sleep
+
+
 uint32 MojoPlatform_ticks(void)
 {
     uint64 then_ms, now_ms;