From: notaz Date: Thu, 19 Oct 2023 21:20:19 +0000 (+0300) Subject: reduce seeking and open handles to maybe help smb X-Git-Tag: r24~103 X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=commitdiff_plain;h=34ee348026b79e9bc0bc20450bf99ee987970a06 reduce seeking and open handles to maybe help smb libretro/pcsx_rearmed#342 --- diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c index 081a8f2b..db57b0c5 100644 --- a/libpcsxcore/cdriso.c +++ b/libpcsxcore/cdriso.c @@ -26,14 +26,15 @@ #include "ppf.h" #ifdef _WIN32 -#define WIN32_LEAN_AND_MEAN -#include -#include #define strcasecmp _stricmp -#elif P_HAVE_PTHREAD +#else +#include +#include +#include +#if P_HAVE_PTHREAD #include #include -#include +#endif #endif #include #include @@ -90,6 +91,8 @@ static struct { unsigned int current_buffer; unsigned int sector_in_hunk; } *chd_img; +#else +#define chd_img 0 #endif static int (*cdimg_read_func)(FILE *f, unsigned int base, void *dest, int sector); @@ -159,6 +162,21 @@ static void tok2msf(char *time, char *msf) { } } +static off_t get_size(FILE *f) +{ + off_t old, size; +#if !defined(USE_LIBRETRO_VFS) + struct stat st; + if (fstat(fileno(f), &st) == 0) + return st.st_size; +#endif + old = ftello(f); + fseeko(f, 0, SEEK_END); + size = ftello(f); + fseeko(f, old, SEEK_SET); + return size; +} + // this function tries to get the .toc file of the given .bin // the necessary data is put into the ti (trackinformation)-array static int parsetoc(const char *isofile) { @@ -312,6 +330,7 @@ static int parsecue(const char *isofile) { char filepath[MAXPATHLEN]; char *incue_fname; FILE *fi; + FILE *ftmp = NULL; char *token; char time[20]; char *tmp; @@ -325,18 +344,21 @@ static int parsecue(const char *isofile) { // copy name of the iso and change extension from .bin to .cue strncpy(cuename, isofile, sizeof(cuename)); cuename[MAXPATHLEN - 1] = '\0'; - if (strlen(cuename) >= 4) { + if (strlen(cuename) < 4) + return -1; + if (strcasecmp(cuename + strlen(cuename) - 4, ".cue") == 0) { + // it's already open as cdHandle + fi = cdHandle; + } + else { // If 'isofile' is a '.cd' file, use it as a .cue file // and don't try to search the additional .cue file if (strncasecmp(cuename + strlen(cuename) - 4, ".cd", 3) != 0 ) - strcpy(cuename + strlen(cuename) - 4, ".cue"); - } - else { - return -1; - } + strcpy(cuename + strlen(cuename) - 4, ".cue"); - if ((fi = fopen(cuename, "r")) == NULL) { - return -1; + if ((ftmp = fopen(cuename, "r")) == NULL) + return -1; + fi = ftmp; } // Some stupid tutorials wrongly tell users to use cdrdao to rip a @@ -346,10 +368,11 @@ static int parsecue(const char *isofile) { if (!strncmp(linebuf, "CD_ROM_XA", 9)) { // Don't proceed further, as this is actually a .toc file rather // than a .cue file. - fclose(fi); + if (ftmp) + fclose(ftmp); return parsetoc(isofile); } - fseek(fi, 0, SEEK_SET); + rewind(fi); } // build a path for files referenced in .cue @@ -457,25 +480,23 @@ static int parsecue(const char *isofile) { SysPrintf(_("\ncould not open: %s\n"), filepath); continue; } - fseek(ti[numtracks + 1].handle, 0, SEEK_END); - file_len = ftell(ti[numtracks + 1].handle) / 2352; - - if (numtracks == 0 && strlen(isofile) >= 4 && - (strcmp(isofile + strlen(isofile) - 4, ".cue") == 0 || - strncasecmp(isofile + strlen(isofile) - 4, ".cd", 3) == 0)) { - // user selected .cue/.cdX as image file, use it's data track instead - fclose(cdHandle); - cdHandle = fopen(filepath, "rb"); - } + file_len = get_size(ti[numtracks + 1].handle) / 2352; } } - fclose(fi); + if (ftmp) + fclose(ftmp); // if there are no tracks detected, then it's not a cue file if (!numtracks) return -1; + // the data track handle is always in cdHandle + if (ti[1].handle) { + fclose(cdHandle); + cdHandle = ti[1].handle; + ti[1].handle = NULL; + } return 0; } @@ -530,8 +551,7 @@ static int parseccd(const char *isofile) { // Fill out the last track's end based on size if (numtracks >= 1) { - fseek(cdHandle, 0, SEEK_END); - t = ftell(cdHandle) / 2352 - msf2sec(ti[numtracks].start) + 2 * 75; + t = get_size(cdHandle) / 2352 - msf2sec(ti[numtracks].start) + 2 * 75; sec2msf(t, ti[numtracks].length); } @@ -686,11 +706,9 @@ static int handlepbp(const char *isofile) { if (strlen(isofile) >= 4) ext = isofile + strlen(isofile) - 4; - if (ext == NULL || (strcmp(ext, ".pbp") != 0 && strcmp(ext, ".PBP") != 0)) + if (ext == NULL || strcasecmp(ext, ".pbp") != 0) return -1; - fseeko(cdHandle, 0, SEEK_SET); - numtracks = 0; ret = fread(&pbp_hdr, 1, sizeof(pbp_hdr), cdHandle); @@ -839,9 +857,8 @@ fail_index: goto done; fail_io: -#ifndef NDEBUG SysPrintf(_("File IO error in <%s:%s>.\n"), __FILE__, __func__); -#endif + rewind(cdHandle); done: if (compr_img != NULL) { @@ -872,23 +889,21 @@ static int handlecbin(const char *isofile) { if (ext == NULL || (strcasecmp(ext + 1, ".cbn") != 0 && strcasecmp(ext, ".cbin") != 0)) return -1; - fseek(cdHandle, 0, SEEK_SET); - ret = fread(&ciso_hdr, 1, sizeof(ciso_hdr), cdHandle); if (ret != sizeof(ciso_hdr)) { SysPrintf("failed to read ciso header\n"); - return -1; + goto fail_io; } if (strncmp(ciso_hdr.magic, "CISO", 4) != 0 || ciso_hdr.total_bytes <= 0 || ciso_hdr.block_size <= 0) { SysPrintf("bad ciso header\n"); - return -1; + goto fail_io; } if (ciso_hdr.header_size != 0 && ciso_hdr.header_size != sizeof(ciso_hdr)) { ret = fseeko(cdHandle, ciso_hdr.header_size, SEEK_SET); if (ret != 0) { SysPrintf("failed to seek to %x\n", ciso_hdr.header_size); - return -1; + goto fail_io; } } @@ -932,6 +947,7 @@ fail_io: free(compr_img); compr_img = NULL; } + rewind(cdHandle); return -1; } @@ -1063,8 +1079,7 @@ static int opensbifile(const char *isoname) { return -1; } - fseek(cdHandle, 0, SEEK_END); - s = ftell(cdHandle) / 2352; + s = msf2sec(ti[1].length); return LoadSBI(sbiname, s); } @@ -1072,7 +1087,9 @@ static int opensbifile(const char *isoname) { static int cdread_normal(FILE *f, unsigned int base, void *dest, int sector) { int ret; - if (fseek(f, base + sector * CD_FRAMESIZE_RAW, SEEK_SET)) + if (!f) + return -1; + if (fseeko(f, base + sector * CD_FRAMESIZE_RAW, SEEK_SET)) goto fail_io; ret = fread(dest, 1, CD_FRAMESIZE_RAW, f); if (ret <= 0) @@ -1089,7 +1106,9 @@ static int cdread_sub_mixed(FILE *f, unsigned int base, void *dest, int sector) { int ret; - if (fseek(f, base + sector * (CD_FRAMESIZE_RAW + SUB_FRAMESIZE), SEEK_SET)) + if (!f) + return -1; + if (fseeko(f, base + sector * (CD_FRAMESIZE_RAW + SUB_FRAMESIZE), SEEK_SET)) goto fail_io; ret = fread(dest, 1, CD_FRAMESIZE_RAW, f); if (ret <= 0) @@ -1103,7 +1122,9 @@ fail_io: static int cdread_sub_sub_mixed(FILE *f, int sector) { - if (fseek(f, sector * (CD_FRAMESIZE_RAW + SUB_FRAMESIZE) + CD_FRAMESIZE_RAW, SEEK_SET)) + if (!f) + return -1; + if (fseeko(f, sector * (CD_FRAMESIZE_RAW + SUB_FRAMESIZE) + CD_FRAMESIZE_RAW, SEEK_SET)) goto fail_io; if (fread(subbuffer, 1, SUB_FRAMESIZE, f) != SUB_FRAMESIZE) goto fail_io; @@ -1154,6 +1175,8 @@ static int cdread_compressed(FILE *f, unsigned int base, void *dest, int sector) off_t start_byte; int ret, block; + if (!cdHandle) + return -1; if (base) sector += base / 2352; @@ -1283,7 +1306,9 @@ static int cdread_2048(FILE *f, unsigned int base, void *dest, int sector) { int ret; - fseek(f, base + sector * 2048, SEEK_SET); + if (!f) + return -1; + fseeko(f, base + sector * 2048, SEEK_SET); ret = fread((char *)dest + 12 * 2, 1, 2048, f); // not really necessary, fake mode 2 header @@ -1326,8 +1351,9 @@ static long CALLBACK ISOopen(void) { char alt_bin_filename[MAXPATHLEN]; const char *bin_filename; char image_str[1024]; + off_t size_main; - if (cdHandle != NULL) { + if (cdHandle || chd_img) { return 0; // it's already open } @@ -1337,6 +1363,7 @@ static long CALLBACK ISOopen(void) { GetIsoFile(), strerror(errno)); return -1; } + size_main = get_size(cdHandle); snprintf(image_str, sizeof(image_str) - 6*4 - 1, "Loaded CD Image: %s", GetIsoFile()); @@ -1380,6 +1407,8 @@ static long CALLBACK ISOopen(void) { CDR_getBuffer = ISOgetBuffer_chd; cdimg_read_func = cdread_chd; cdimg_read_sub_func = cdread_sub_chd; + fclose(cdHandle); + cdHandle = NULL; } #endif @@ -1390,11 +1419,9 @@ static long CALLBACK ISOopen(void) { strcat(image_str, "[+sbi]"); } - fseeko(cdHandle, 0, SEEK_END); - // maybe user selected metadata file instead of main .bin .. bin_filename = GetIsoFile(); - if (ftello(cdHandle) < 2352 * 0x10) { + if (cdHandle && size_main < 2352 * 0x10) { static const char *exts[] = { ".bin", ".BIN", ".img", ".IMG" }; FILE *tmpf = NULL; size_t i; @@ -1415,14 +1442,13 @@ static long CALLBACK ISOopen(void) { bin_filename = alt_bin_filename; fclose(cdHandle); cdHandle = tmpf; - fseeko(cdHandle, 0, SEEK_END); + size_main = get_size(cdHandle); } } // guess whether it is mode1/2048 - if (cdimg_read_func == cdread_normal && ftello(cdHandle) % 2048 == 0) { + if (cdHandle && cdimg_read_func == cdread_normal && size_main % 2048 == 0) { unsigned int modeTest = 0; - fseek(cdHandle, 0, SEEK_SET); if (!fread(&modeTest, sizeof(modeTest), 1, cdHandle)) { SysPrintf(_("File IO error in <%s:%s>.\n"), __FILE__, __func__); } @@ -1431,7 +1457,6 @@ static long CALLBACK ISOopen(void) { isMode1ISO = TRUE; } } - fseek(cdHandle, 0, SEEK_SET); SysPrintf("%s.\n", image_str); @@ -1446,11 +1471,6 @@ static long CALLBACK ISOopen(void) { cdimg_read_sub_func = NULL; } - // make sure we have another handle open for cdda - if (numtracks > 1 && ti[1].handle == NULL) { - ti[1].handle = fopen(bin_filename, "rb"); - } - return 0; } @@ -1580,9 +1600,8 @@ static boolean CALLBACK ISOreadTrack(unsigned char *time) { int sector = MSF2SECT(btoi(time[0]), btoi(time[1]), btoi(time[2])); long ret; - if (cdHandle == NULL) { + if (!cdHandle && !chd_img) return 0; - } if (pregapOffset && sector >= pregapOffset) sector -= 2 * 75; @@ -1621,7 +1640,7 @@ static unsigned char* CALLBACK ISOgetBufferSub(int sector) { return NULL; } else if (subHandle != NULL) { - if (fseek(subHandle, sector * SUB_FRAMESIZE, SEEK_SET)) + if (fseeko(subHandle, sector * SUB_FRAMESIZE, SEEK_SET)) return NULL; if (fread(subbuffer, 1, SUB_FRAMESIZE, subHandle) != SUB_FRAMESIZE) return NULL; @@ -1658,7 +1677,8 @@ static long CALLBACK ISOgetStatus(struct CdrStat *stat) { // read CDDA sector into buffer long CALLBACK ISOreadCDDA(unsigned char m, unsigned char s, unsigned char f, unsigned char *buffer) { unsigned char msf[3] = {m, s, f}; - unsigned int file, track, track_start = 0; + unsigned int track, track_start = 0; + FILE *handle = cdHandle; int ret; cddaCurPos = msf2sec((char *)msf); @@ -1678,15 +1698,22 @@ long CALLBACK ISOreadCDDA(unsigned char m, unsigned char s, unsigned char f, uns return 0; } - file = 1; if (multifile) { // find the file that contains this track - for (file = track; file > 1; file--) - if (ti[file].handle != NULL) + unsigned int file; + for (file = track; file > 1; file--) { + if (ti[file].handle != NULL) { + handle = ti[file].handle; break; + } + } + } + if (!handle) { + memset(buffer, 0, CD_FRAMESIZE_RAW); + return -1; } - ret = cdimg_read_func(ti[file].handle, ti[track].start_offset, + ret = cdimg_read_func(handle, ti[track].start_offset, buffer, cddaCurPos - track_start); if (ret != CD_FRAMESIZE_RAW) { memset(buffer, 0, CD_FRAMESIZE_RAW); @@ -1732,5 +1759,5 @@ void cdrIsoInit(void) { } int cdrIsoActive(void) { - return (cdHandle != NULL); + return (cdHandle || chd_img); }