static int hits, reads;
+//#define THREADED_CD_IO
+
+/* threaded reader */
+#ifdef THREADED_CD_IO
+#include <pthread.h>
+#define tioprintf printf
+
+static pthread_t thr_thread = 0;
+static pthread_cond_t thr_cond = PTHREAD_COND_INITIALIZER;
+static pthread_mutex_t thr_mutex = PTHREAD_MUTEX_INITIALIZER;
+static unsigned char *thr_buffer[2][2048 + 304] __attribute__((aligned(4)));
+static int thr_lba_need;
+static int thr_lba_have[2];
+
+static void thr_read_lba(int slot, int lba)
+{
+ int is_bin = Pico_mcd->TOC.Tracks[0].ftype == TYPE_BIN;
+ int where_seek = is_bin ? (lba * 2352 + 16) : (lba << 11);
+
+ pm_seek(Pico_mcd->TOC.Tracks[0].F, where_seek, SEEK_SET);
+ pm_read(thr_buffer[slot], 2048, Pico_mcd->TOC.Tracks[0].F);
+ thr_lba_have[slot] = lba;
+}
+
+static void *buffering_thread(void *arg)
+{
+ int free_slot, lba;
+
+ elprintf(EL_STATUS, "CD I/O thread started.");
+
+ pthread_mutex_lock(&thr_mutex);
+
+ while (1)
+ {
+ if (thr_lba_need < 0) goto wait;
+
+ free_slot = -1;
+ if (thr_lba_have[0] == -1) free_slot = 0;
+ if (thr_lba_have[1] == -1) free_slot = 1;
+ if (free_slot == -1) goto wait;
+
+ lba = thr_lba_need;
+ if (lba != thr_lba_have[free_slot^1]) {
+ thr_read_lba(free_slot, lba);
+ tioprintf("t done %i %i\n", lba, free_slot);
+ continue;
+ }
+ lba++;
+ if (lba != thr_lba_have[free_slot^1]) {
+ thr_read_lba(free_slot, lba);
+ tioprintf("t done %i %i\n", lba, free_slot);
+ continue;
+ }
+
+wait:
+ pthread_cond_wait(&thr_cond, &thr_mutex);
+ tioprintf("t wake\n");
+ }
+
+ pthread_mutex_unlock(&thr_mutex);
+
+ return NULL;
+}
+
+static void threaded_read(void *dest, int lba)
+{
+ int i, have = -1;
+ tioprintf("\n");
+
+ if (lba == thr_lba_have[0]) have = 0;
+ if (lba == thr_lba_have[1]) have = 1;
+ if (have != -1)
+ {
+ tioprintf("r hit %i %i\n", lba, have);
+ memcpy32(dest, (int *)thr_buffer[have], 2048/4);
+ if (lba != prev_lba) {
+ thr_lba_have[have] = -1; // make free slot
+ thr_lba_need = lba + 1; // guess a sequential read..
+ pthread_cond_signal(&thr_cond);
+ sched_yield();
+ prev_lba = lba;
+ }
+ return;
+ }
+
+ tioprintf("r miss %i\n", lba);
+ thr_lba_need = lba;
+ pthread_mutex_lock(&thr_mutex);
+ pthread_mutex_unlock(&thr_mutex);
+ if (lba == thr_lba_have[0]) have = 0;
+ if (lba == thr_lba_have[1]) have = 1;
+ if (have == -1)
+ {
+ // try again..
+ thr_lba_have[0] = thr_lba_have[1] = -1;
+ for (i = 0; have == -1 && i < 10; i++)
+ {
+ tioprintf("r hard %i\n", lba);
+ pthread_cond_signal(&thr_cond);
+ sched_yield();
+ pthread_mutex_lock(&thr_mutex);
+ pthread_mutex_unlock(&thr_mutex);
+ if (lba == thr_lba_have[0]) have = 0;
+ if (lba == thr_lba_have[1]) have = 1;
+ }
+ }
+
+ // we MUST have the data at this point..
+ if (have == -1) { tioprintf("BUG!\n"); exit(1); }
+ tioprintf("r reco %i %i\n", lba, have);
+ memcpy32(dest, (int *)thr_buffer[have], 2048/4);
+ thr_lba_have[have] = -1;
+ pthread_cond_signal(&thr_cond);
+
+ prev_lba = lba;
+ return;
+}
+#endif
+
void PicoCDBufferInit(void)
{
prev_lba = 0x80000000;
hits = reads = 0;
+ cd_buffer = NULL;
if (PicoCDBuffers <= 1) {
PicoCDBuffers = 0;
- return; /* buffering off */
+ goto no_buffering; /* buffering off */
}
/* try alloc'ing until we succeed */
PicoCDBuffers >>= 1;
}
- if (PicoCDBuffers <= 0) return; /* buffering became off */
+ if (PicoCDBuffers > 0) {
+ cd_buffer = tmp;
+ return;
+ }
- cd_buffer = tmp;
+no_buffering:;
+#ifdef THREADED_CD_IO
+ thr_lba_need = thr_lba_have[0] = thr_lba_have[1] = -1;
+ if (thr_thread == 0)
+ {
+ pthread_create(&thr_thread, NULL, buffering_thread, NULL);
+ }
+#endif
}
void PicoCDBufferFree(void)
{
+#ifdef THREADED_CD_IO
+ pthread_mutex_lock(&thr_mutex);
+ pthread_mutex_unlock(&thr_mutex);
+#endif
if (cd_buffer) {
free(cd_buffer);
cd_buffer = NULL;
if (PicoCDBuffers <= 0)
{
+#ifdef THREADED_CD_IO
+ threaded_read(dest, lba);
+ return;
+#else
/* no buffering */
int where_seek = is_bin ? (lba * 2352 + 16) : (lba << 11);
pm_seek(Pico_mcd->TOC.Tracks[0].F, where_seek, SEEK_SET);
pm_read(dest, 2048, Pico_mcd->TOC.Tracks[0].F);
return;
+#endif
}
/* hit? */
#include <linux/limits.h>\r
#include <ctype.h>\r
#include <unistd.h>\r
+#include <sched.h>\r
\r
#include <stdarg.h>\r
\r
pl = (acts >> 16) & 1;\r
if (kb_combo_keys & (1 << i))\r
{\r
- int u, acts_c = acts & kb_combo_acts;\r
+ int u = i+1, acts_c = acts & kb_combo_acts;\r
// let's try to find the other one\r
if (acts_c) {\r
- for (u = i + 1; u < 32; u++)\r
+ for (; u < 32; u++)\r
if ( (keys & (1 << u)) && (currentConfig.KeyBinds[u] & acts_c) ) {\r
allActions[pl] |= acts_c & currentConfig.KeyBinds[u];\r
keys &= ~((1 << i) | (1 << u));\r
\r
spend_cycles(1024);\r
gettimeofday(&tval, 0);\r
- if(thissec != tval.tv_sec) tval.tv_usec+=1000000;\r
+ if (thissec != tval.tv_sec) tval.tv_usec+=1000000;\r
\r
- while(tval.tv_usec < lim_time)\r
+ if (tval.tv_usec < lim_time)\r
+ sched_yield();\r
+\r
+ while (tval.tv_usec < lim_time)\r
{\r
spend_cycles(1024);\r
gettimeofday(&tval, 0);\r
- if(thissec != tval.tv_sec) tval.tv_usec+=1000000;\r
+ if (thissec != tval.tv_sec) tval.tv_usec+=1000000;\r
}\r
}\r
\r
\r
+#if 0\r
+static void tga_dump(void)\r
+{\r
+#define BYTE unsigned char\r
+#define WORD unsigned short\r
+ struct\r
+ {\r
+ BYTE IDLength; /* 00h Size of Image ID field */\r
+ BYTE ColorMapType; /* 01h Color map type */\r
+ BYTE ImageType; /* 02h Image type code */\r
+ WORD CMapStart; /* 03h Color map origin */\r
+ WORD CMapLength; /* 05h Color map length */\r
+ BYTE CMapDepth; /* 07h Depth of color map entries */\r
+ WORD XOffset; /* 08h X origin of image */\r
+ WORD YOffset; /* 0Ah Y origin of image */\r
+ WORD Width; /* 0Ch Width of image */\r
+ WORD Height; /* 0Eh Height of image */\r
+ BYTE PixelDepth; /* 10h Image pixel size */\r
+ BYTE ImageDescriptor; /* 11h Image descriptor byte */\r
+ } __attribute__((packed)) TGAHEAD;\r
+ static unsigned short oldscr[320*240];\r
+ FILE *f; char name[128]; int i;\r
+\r
+ memset(&TGAHEAD, 0, sizeof(TGAHEAD));\r
+ TGAHEAD.ImageType = 2;\r
+ TGAHEAD.Width = 320;\r
+ TGAHEAD.Height = 240;\r
+ TGAHEAD.PixelDepth = 16;\r
+ TGAHEAD.ImageDescriptor = 2<<4; // image starts at top-left\r
+\r
+#define CONV(X) (((X>>1)&0x7fe0)|(X&0x1f)) // 555?\r
+\r
+ for (i = 0; i < 320*240; i++)\r
+ if(oldscr[i] != CONV(((unsigned short *)gp2x_screen)[i])) break;\r
+ if (i < 320*240)\r
+ {\r
+ for (i = 0; i < 320*240; i++)\r
+ oldscr[i] = CONV(((unsigned short *)gp2x_screen)[i]);\r
+ sprintf(name, "%05i.tga", Pico.m.frame_count);\r
+ f = fopen(name, "wb");\r
+ if (!f) { printf("!f\n"); exit(1); }\r
+ fwrite(&TGAHEAD, 1, sizeof(TGAHEAD), f);\r
+ fwrite(oldscr, 1, 320*240*2, f);\r
+ fclose(f);\r
+ }\r
+}\r
+#endif\r
+\r
+\r
void emu_Loop(void)\r
{\r
static int gp2x_old_clock = 200;\r
static int PsndRate_old = 0, PicoOpt_old = 0, EmuOpt_old = 0, pal_old = 0;\r
char fpsbuff[24]; // fps count c string\r
struct timeval tval; // timing\r
- int thissec = 0, frames_done = 0, frames_shown = 0, oldmodes = 0;\r
- int target_fps, target_frametime, lim_time, vsync_offset, i;\r
+ int pframes_done, pframes_shown, pthissec; // "period" frames, used for sync\r
+ int frames_done, frames_shown, thissec; // actual frames\r
+ int oldmodes = 0, target_fps, target_frametime, lim_time, vsync_offset, i;\r
char *notice = 0;\r
\r
printf("entered emu_Loop()\n");\r
} else\r
vsync_offset = 0;\r
\r
- // loop?\r
+ frames_done = frames_shown = thissec =\r
+ pframes_done = pframes_shown = pthissec = 0;\r
+\r
+ // loop\r
while (engineState == PGS_Running)\r
{\r
int modes;\r
gettimeofday(&tval, 0);\r
if (reset_timing) {\r
reset_timing = 0;\r
- thissec = tval.tv_sec;\r
- frames_shown = frames_done = tval.tv_usec/target_frametime;\r
+ pthissec = tval.tv_sec;\r
+ pframes_shown = pframes_done = tval.tv_usec/target_frametime;\r
}\r
\r
// show notice message?\r
sprintf(fpsbuff, "%02i/%02i", frames_shown, frames_done);\r
if (fpsbuff[5] == 0) { fpsbuff[5] = fpsbuff[6] = ' '; fpsbuff[7] = 0; }\r
#endif\r
+ frames_shown = frames_done = 0;\r
thissec = tval.tv_sec;\r
+ }\r
+#ifdef PFRAMES\r
+ sprintf(fpsbuff, "%i", Pico.m.frame_count);\r
+#endif\r
\r
+ if (pthissec != tval.tv_sec)\r
+ {\r
if (PsndOut == 0 && currentConfig.Frameskip >= 0) {\r
- frames_done = frames_shown = 0;\r
+ pframes_done = pframes_shown = 0;\r
} else {\r
// it is quite common for this implementation to leave 1 fame unfinished\r
// when second changes, but we don't want buffer to starve.\r
- if(PsndOut && frames_done < target_fps && frames_done > target_fps-5) {\r
+ if(PsndOut && pframes_done < target_fps && pframes_done > target_fps-5) {\r
updateKeys();\r
- SkipFrame(1); frames_done++;\r
+ SkipFrame(1); pframes_done++;\r
}\r
\r
- frames_done -= target_fps; if (frames_done < 0) frames_done = 0;\r
- frames_shown -= target_fps; if (frames_shown < 0) frames_shown = 0;\r
- if (frames_shown > frames_done) frames_shown = frames_done;\r
+ pframes_done -= target_fps; if (pframes_done < 0) pframes_done = 0;\r
+ pframes_shown -= target_fps; if (pframes_shown < 0) pframes_shown = 0;\r
+ if (pframes_shown > pframes_done) pframes_shown = pframes_done;\r
}\r
+ pthissec = tval.tv_sec;\r
}\r
-#ifdef PFRAMES\r
- sprintf(fpsbuff, "%i", Pico.m.frame_count);\r
-#endif\r
\r
- lim_time = (frames_done+1) * target_frametime + vsync_offset;\r
- if(currentConfig.Frameskip >= 0) { // frameskip enabled\r
+ lim_time = (pframes_done+1) * target_frametime + vsync_offset;\r
+ if (currentConfig.Frameskip >= 0) // frameskip enabled\r
+ {\r
for(i = 0; i < currentConfig.Frameskip; i++) {\r
updateKeys();\r
- SkipFrame(1); frames_done++;\r
+ SkipFrame(1); pframes_done++; frames_done++;\r
if (PsndOut && !reset_timing) { // do framelimitting if sound is enabled\r
gettimeofday(&tval, 0);\r
- if(thissec != tval.tv_sec) tval.tv_usec+=1000000;\r
- if(tval.tv_usec < lim_time) { // we are too fast\r
- simpleWait(thissec, lim_time);\r
+ if (pthissec != tval.tv_sec) tval.tv_usec+=1000000;\r
+ if (tval.tv_usec < lim_time) { // we are too fast\r
+ simpleWait(pthissec, lim_time);\r
}\r
}\r
lim_time += target_frametime;\r
}\r
- } else if(tval.tv_usec > lim_time) { // auto frameskip\r
+ }\r
+ else if (tval.tv_usec > lim_time) // auto frameskip\r
+ {\r
// no time left for this frame - skip\r
if (tval.tv_usec - lim_time >= 300000) {\r
/* something caused a slowdown for us (disk access? cache flush?)\r
continue;\r
}\r
updateKeys();\r
- SkipFrame(tval.tv_usec < lim_time+target_frametime*2); frames_done++;\r
+ SkipFrame(tval.tv_usec < lim_time+target_frametime*2); pframes_done++; frames_done++;\r
continue;\r
}\r
\r
updateKeys();\r
PicoFrame();\r
\r
-#if 0\r
-if (Pico.m.frame_count == 31563) {\r
- FILE *f;\r
- f = fopen("ram_p.bin", "wb");\r
- if (!f) { printf("!f\n"); exit(1); }\r
- fwrite(Pico.ram, 1, 0x10000, f);\r
- fclose(f);\r
- exit(0);\r
-}\r
-#endif\r
-#if 0\r
- // debug\r
- {\r
- #define BYTE unsigned char\r
- #define WORD unsigned short\r
- struct\r
- {\r
- BYTE IDLength; /* 00h Size of Image ID field */\r
- BYTE ColorMapType; /* 01h Color map type */\r
- BYTE ImageType; /* 02h Image type code */\r
- WORD CMapStart; /* 03h Color map origin */\r
- WORD CMapLength; /* 05h Color map length */\r
- BYTE CMapDepth; /* 07h Depth of color map entries */\r
- WORD XOffset; /* 08h X origin of image */\r
- WORD YOffset; /* 0Ah Y origin of image */\r
- WORD Width; /* 0Ch Width of image */\r
- WORD Height; /* 0Eh Height of image */\r
- BYTE PixelDepth; /* 10h Image pixel size */\r
- BYTE ImageDescriptor; /* 11h Image descriptor byte */\r
- } __attribute__((packed)) TGAHEAD;\r
- static unsigned short oldscr[320*240];\r
- FILE *f; char name[128]; int i;\r
-\r
- memset(&TGAHEAD, 0, sizeof(TGAHEAD));\r
- TGAHEAD.ImageType = 2;\r
- TGAHEAD.Width = 320;\r
- TGAHEAD.Height = 240;\r
- TGAHEAD.PixelDepth = 16;\r
- TGAHEAD.ImageDescriptor = 2<<4; // image starts at top-left\r
-\r
- #define CONV(X) (((X>>1)&0x7fe0)|(X&0x1f)) // 555?\r
-\r
- for (i = 0; i < 320*240; i++)\r
- if(oldscr[i] != CONV(((unsigned short *)gp2x_screen)[i])) break;\r
- if (i < 320*240)\r
- {\r
- for (i = 0; i < 320*240; i++)\r
- oldscr[i] = CONV(((unsigned short *)gp2x_screen)[i]);\r
- sprintf(name, "%05i.tga", Pico.m.frame_count);\r
- f = fopen(name, "wb");\r
- if (!f) { printf("!f\n"); exit(1); }\r
- fwrite(&TGAHEAD, 1, sizeof(TGAHEAD), f);\r
- fwrite(oldscr, 1, 320*240*2, f);\r
- fclose(f);\r
- }\r
- }\r
-#endif\r
-\r
// check time\r
gettimeofday(&tval, 0);\r
- if (thissec != tval.tv_sec) tval.tv_usec+=1000000;\r
+ if (pthissec != tval.tv_sec) tval.tv_usec+=1000000;\r
\r
if (currentConfig.Frameskip < 0 && tval.tv_usec - lim_time >= 300000) // slowdown detection\r
reset_timing = 1;\r
// we are too fast\r
if (vsync_offset) {\r
if (lim_time - tval.tv_usec > target_frametime/2)\r
- simpleWait(thissec, lim_time - target_frametime/4);\r
+ simpleWait(pthissec, lim_time - target_frametime/4);\r
gp2x_video_wait_vsync();\r
} else {\r
- simpleWait(thissec, lim_time);\r
+ simpleWait(pthissec, lim_time);\r
}\r
}\r
}\r
\r
blit(fpsbuff, notice);\r
\r
- frames_done++; frames_shown++;\r
+ pframes_done++; pframes_shown++;\r
+ frames_done++; frames_shown++;\r
}\r
\r
change_fast_forward(0);\r
reset_timing = 1;\r
}\r
\r
-\r
notaz.gp2x.de / picodrive.git / commitdiff