From fe54ff5710fd1720312e29985ba4e67709ce48a1 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Sat, 8 Aug 2015 13:44:21 -0500 Subject: [PATCH] ok made the logging handle into to global variables struct handle! deleted: DEBUG.16 deleted: HEAP.16 deleted: MMDUMP.16 deleted: PROFILE.16 modified: exmmtest.exe modified: scroll.exe modified: src/exmmtest.c modified: src/lib/16_ca.c modified: src/lib/16_ca.h modified: src/lib/16_hc.c modified: src/lib/16_hc.h modified: src/lib/16_head.h modified: src/lib/16_mm.c modified: src/lib/16_mm.h --- DEBUG.16 | 18 ------------------ HEAP.16 | 45 --------------------------------------------- MMDUMP.16 | Bin 44 -> 0 bytes PROFILE.16 | 0 exmmtest.exe | Bin 43080 -> 43144 bytes scroll.exe | Bin 55884 -> 55884 bytes src/exmmtest.c | 9 +++++---- src/lib/16_ca.c | 18 ++++++++---------- src/lib/16_ca.h | 18 +++++++++--------- src/lib/16_hc.c | 41 +++++++++++++++++++---------------------- src/lib/16_hc.h | 10 ++++------ src/lib/16_head.h | 14 ++++++++++---- src/lib/16_mm.c | 12 ++++++------ src/lib/16_mm.h | 2 +- 14 files changed, 62 insertions(+), 125 deletions(-) delete mode 100644 DEBUG.16 delete mode 100644 HEAP.16 delete mode 100644 MMDUMP.16 delete mode 100644 PROFILE.16 diff --git a/DEBUG.16 b/DEBUG.16 deleted file mode 100644 index 7eaa3cc3..00000000 --- a/DEBUG.16 +++ /dev/null @@ -1,18 +0,0 @@ -0 Size:5546 Owner:0x0 -0 Size:5546 Owner:0x0 -15aa Size:256 Owner:0x351e -Seg:16aa Size:273 Owner:0x857a -Seg:1cf8 Size:49 Owner:0x0 -Seg:ad29 Size:8920 Owner:0x0 -Seg:d022 Size:4294967263 Owner:0x0 -Seg:d022 Size:4294967263 Owner:0x0 -Seg:d022 Size:4294967263 Owner:0x0 -Seg:d022 Size:4294967263 Owner:0x0 -Seg:d022 Size:4294967263 Owner:0x0 -Seg:d022 Size:4294967263 Owner:0x0 -Seg:d022 Size:4294967263 Owner:0x0 -Seg:d022 Size:4294967263 Owner:0x0 -Seg:d022 Size:4294967263 Owner:0x0 -Seg:d022 Size:4294967263 Owner:0x0 -Seg:d022 Size:419 Owner:0x0 -Seg:e000 Size:4294909951 Owner:0x0 diff --git a/HEAP.16 b/HEAP.16 deleted file mode 100644 index 7a50a81f..00000000 --- a/HEAP.16 +++ /dev/null @@ -1,45 +0,0 @@ - - == default == - - USED block at 1d1a0016 of size 136 - USED block at 1d1a009e of size 66 - FREE block at 1d1a00e0 of size 18 - USED block at 1d1a00f2 of size 20 - FREE block at 1d1a0106 of size 7926 -OK - end of heap - - == near == - - USED block at 0 of size 0 - USED block at 0 of size 0 - USED block at 0 of size 0 - USED block at 0 of size 0 - USED block at 0 of size 0 - USED block at 0 of size 0 - USED block at 0 of size 0 - USED block at 0 of size 0 - USED block at 0 of size 0 -OK - end of heap - - == far == - - USED block at 0 of size 0 - USED block at 0 of size 0 - USED block at 0 of size 0 - USED block at 0 of size 0 - USED block at 0 of size 0 -OK - end of heap - -Memory Type Total Used Free ----------------- -------- -------- -------- -Default 8166 222 7944 -Near 31318 862 30456 -Far 8166 222 7944 ----------------- -------- -------- -------- -coreleft = 30454 -farcoreleft = 38202 -GetFreeSize = 7768 -GetNearFreeSize = 30456 -GetFarFreeSize = 7768 -memavl = 30454 -stackavail = 11049 diff --git a/MMDUMP.16 b/MMDUMP.16 deleted file mode 100644 index 58c6845a294eceda0a09feedb63490c52597f51a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 44 ocmXr0FfcGmu`)I_OjXd(WzbZxRWRV?GJuF$n3^X7MFpXv0MFM5i2wiq diff --git a/PROFILE.16 b/PROFILE.16 deleted file mode 100644 index e69de29b..00000000 diff --git a/exmmtest.exe b/exmmtest.exe index 72f080b382981360b59fdf6a68fd3d0c676288f9..64f660ace47e5e1e43485bc2e4cac9faa46a35d7 100644 GIT binary patch delta 11342 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 Bps)Y{ diff --git a/scroll.exe b/scroll.exe index a1a636ad2a85c98859964bb700c3960234792e76..1e15ab21b8a82ea217b77896f7da9744d85b198b 100644 GIT binary patch delta 1204 zcmZ9KUuYav6vprDKSLZgsd;cCHr;BAZKaU05kU(^kcq|;Zg#^YP+5HJi|Z0LlNC%h z&BW1hW|o-fHcvq-wx#%BO}dOJEbE$NNn6F;Kq>8usD!g=DH1~?rQGY8ofM%D-^}56 z?>*nS=br0}{_BhW?=zwP79Sz)s3AWgXHXCzgrnMmgd9Y@f_fWu67@bRi~1b(4eBzg zf~uhysv|_m^9yUCcl^iB3Q*b;?~f^ir|*6$I014+Ahue7jXhS?QnoAl93#Y#Hw*=A zdETm3^vT(t=DpdkjuTLxspv`myI9dvoZ@%fjpYdp<(wN$Q_hi0 zHEB({4L?OpUFDYo6@7vUB-l)_bmk+5KFmx#!_E0&7HlHxe;Rt48CbeeHgQS26EJiY zccj_+AK7jrpJIldVNMG%s?>=RQ<^ z^<~k``azr9TB|CR;ObGY&)D87b^8I^dmSp8`3%e5?EMyL`>fcW z{q_i&{<9SI8^86!PW<$PX<=*|rUsl=BGq;ZldStS?9fQNR=mi3>8G@!%7Pi$O}SyNBpLh7-F^mpiUA_jLl8|~jGP&2Uw)A3wl zTU!qB(WVCO7btw>u@E0^Zm=k!a4N1Xhj<~$8l)A8;*pd`L_GJVN3z2n8p2I4c_{6X z4J1*Is2&+Z67~p=oI4iRkUWev%(c?N>cA{+5Rx;HJgc z;6^%2TKeSw-o z{e-%U+Cv=)6ViWuE&O(HU`Bx2;p9+48J>EO7wizZArMQQh0Vie!&G+b>`P9FE^q1z zSaQ{D*4cFFLg&$(eV%}Fq|Q|LH?ht#E*0xCLsKqzR@t+zQqf{XZZ@ro%HiNCD4bmk z5UFM=4`5>eqUUWarOf{D54kZYKr01TlbSpq)8vJiCC^&ws$L#<&8AtNaN$tWQdTW_ z)l%>4%Cy{+tEjpbwqZ8)_>L84dU{5WZ(H%Qw4ukhq%~8y2KS{= zCT+lS)L>b6E>vd)E|88+QfG_@h|b2jA?J*8kAi1lO@|eaS$N_E$(}S#BU) z|9wy|XL4L;d2V+Ry+Q35F%*;9QKGfFsUc6-S%rrPoc3(=03DLn@U1K98EXFGjztW4 z#vK!}mxB~BNT)xpjRaet37S*kB>T`+Yp&|pgit##P*(*jU3Jw>vjMNAFr&6C8p=5n zKJ4}8YBr=A+Cv1l?-)I#Ie9!nZn47c z0DqNjHy{WLJ# zYY!73?Ld6x_X$v>1?kRl&B3o5IibmppeZ%d`kHGFejCp44Oep}u)|>M1-Et9o$E4~ z%8jzh*B?tuFD;#U7`y46qtTqfGU&)W;~4oC>(B)JeWpGBet{b49r!d^Oz&#TA$ROR z8xIK-@;(c@W1VdlBNRSJYRh4_s`57JM)HnNGCmP8?k%6>#(i`NFTLWU37>2tIq8$E zPbQJ{_ykwZTZ>yrh)?h%Jn{*W?L@nL!6%DIe)Y+`PcCEmn?7OB`)Cg@*@{VW ciX3}x$_s#MX)handle.debughandle = open("debug.16", O_CREAT | O_WRONLY | O_TEXT); } -void CA_CloseDebug(void) +void CA_CloseDebug(global_game_variables_t *gvar) { - close(debughandle); + close(gvar->handle.debughandle); } @@ -1079,11 +1077,11 @@ asm mov ds,ax ====================== */ -void CA_Startup(void) +void CA_Startup(global_game_variables_t *gvar) { #ifdef PROFILE unlink("profile.16"); - profilehandle = open("profile.16", O_CREAT | O_WRONLY | O_TEXT); + gvar->handle.profilehandle = open("profile.16", O_CREAT | O_WRONLY | O_TEXT); #endif /*++++ // MDM begin - (GAMERS EDGE) @@ -1141,10 +1139,10 @@ void CA_Startup(void) ====================== */ -void CA_Shutdown(void) +void CA_Shutdown(global_game_variables_t *gvar) { #ifdef PROFILE - close(profilehandle); + close(gvar->handle.profilehandle); #endif /*++++ close(maphandle); diff --git a/src/lib/16_ca.h b/src/lib/16_ca.h index 77809387..d0984fd6 100644 --- a/src/lib/16_ca.h +++ b/src/lib/16_ca.h @@ -36,7 +36,7 @@ //#define AUDIOHEADERLINKED //#define NUMMAPS 39 -//#define MAPPLANES 3 +//#define MAPPLANES 3 #define PROFILE //=========================================================================== @@ -64,7 +64,7 @@ extern byte ca_levelbit,ca_levelnum; extern char *titleptr[8];*/ -extern int profilehandle,debughandle; +//extern // // hooks for custom cache dialogs @@ -80,21 +80,21 @@ extern void (*finishcachebox) (void); //void CAL_ShiftSprite (unsigned segment,unsigned source,unsigned dest,unsigned width, unsigned height, unsigned pixshift, boolean domask); //=========================================================================== - -void CA_OpenDebug (void); -void CA_CloseDebug (void); + +void CA_OpenDebug (global_game_variables_t *gvar); +void CA_CloseDebug (global_game_variables_t *gvar); boolean CA_FarRead (int handle, byte huge *dest, dword length, mminfo_t *mm); -boolean CA_FarWrite (int handle, byte huge *source, dword length, mminfo_t *mm); +boolean CA_FarWrite (int handle, byte huge *source, dword length, mminfo_t *mm); boolean CA_ReadFile (char *filename, memptr *ptr, mminfo_t *mm); -boolean CA_LoadFile (char *filename, memptr *ptr, mminfo_t *mm, mminfotype *mmi); +boolean CA_LoadFile (char *filename, memptr *ptr, mminfo_t *mm, mminfotype *mmi); //long CA_RLEWCompress (unsigned huge *source, long length, unsigned huge *dest,unsigned rlewtag); //void CA_RLEWexpand (unsigned huge *source, unsigned huge *dest,long length,unsigned rlewtag); -void CA_Startup (void); -void CA_Shutdown (void); +void CA_Startup (global_game_variables_t *gvar); +void CA_Shutdown (global_game_variables_t *gvar); //void CA_CacheAudioChunk (int chunk); //void CA_LoadAllSounds (void); diff --git a/src/lib/16_hc.c b/src/lib/16_hc.c index d72b334d..afe6e310 100644 --- a/src/lib/16_hc.c +++ b/src/lib/16_hc.c @@ -25,8 +25,6 @@ #include "src/lib/16_hc.h" -int heaphandle; - #ifdef __BORLANDC__ void * LargestFreeBlock(size_t* Size) #endif @@ -390,17 +388,17 @@ size_t GetNearFreeSize(void) return nh_free; } -void heapdump(void) +void heapdump(global_game_variables_t *gvar) { struct _heapinfo fh_info, nh_info, h_info; int heap_status; size_t h_free, nh_free, fh_free, h_total, nh_total, fh_total, h_used, nh_used, fh_used; byte scratch[1024],str[16]; - HC_OpenDebug(); + HC_OpenDebug(gvar); strcpy(scratch,"\n == default ==\n\n"); - write(heaphandle,scratch,strlen(scratch)); + write(gvar->handle.heaphandle,scratch,strlen(scratch)); h_info._pentry = NULL; h_free=0; h_total=0; h_used=0; for(;;) { @@ -410,13 +408,13 @@ void heapdump(void) if((h_info._useflag == _USEDENTRY ? "USED" : "FREE")=="FREE") h_free += h_info._size; if((h_info._useflag == _USEDENTRY ? "USED" : "FREE")=="USED") h_used += h_info._size; h_total += h_info._size; - write(heaphandle,scratch,strlen(scratch)); + write(gvar->handle.heaphandle,scratch,strlen(scratch)); } - heapstat(heap_status, &scratch); + heapstat(gvar, heap_status, &scratch); //near strcpy(scratch,"\n == near ==\n\n"); - write(heaphandle,scratch,strlen(scratch)); + write(gvar->handle.heaphandle,scratch,strlen(scratch)); nh_info._pentry = NULL; nh_free=0; nh_total=0; nh_used=0; for(;;) { @@ -429,13 +427,13 @@ nh_info._pentry, nh_info._size );*/ if((nh_info._useflag == _USEDENTRY ? "USED" : "FREE")=="FREE") nh_free += nh_info._size; if((nh_info._useflag == _USEDENTRY ? "USED" : "FREE")=="USED") nh_used += nh_info._size; nh_total += nh_info._size; - write(heaphandle,scratch,strlen(scratch)); + write(gvar->handle.heaphandle,scratch,strlen(scratch)); } - heapstat(heap_status, &scratch); + heapstat(gvar, heap_status, &scratch); //far strcpy(scratch,"\n == far ==\n\n"); - write(heaphandle,scratch,strlen(scratch)); + write(gvar->handle.heaphandle,scratch,strlen(scratch)); fh_info._pentry = NULL; fh_free=0; fh_total=0; fh_used=0; for(;;) { @@ -448,9 +446,9 @@ fh_info._pentry, fh_info._size );*/ if((fh_info._useflag == _USEDENTRY ? "USED" : "FREE")=="FREE") fh_free += fh_info._size; if((fh_info._useflag == _USEDENTRY ? "USED" : "FREE")=="USED") fh_used += fh_info._size; fh_total += fh_info._size; - write(heaphandle,scratch,strlen(scratch)); + write(gvar->handle.heaphandle,scratch,strlen(scratch)); } - heapstat(heap_status, &scratch); + heapstat(gvar, heap_status, &scratch); strcpy(scratch,"\n"); strcat(scratch,kittengets(2,0,"Memory Type Total Used Free\n")); @@ -466,11 +464,11 @@ fh_info._pentry, fh_info._size );*/ strcat(scratch,"GetFarFreeSize = "); ultoa((dword)GetFarFreeSize(),str,10); strcat(scratch,str); strcat(scratch,"\n"); strcat(scratch,"memavl = "); ultoa((dword)_memavl(),str,10); strcat(scratch,str); strcat(scratch,"\n"); strcat(scratch,"stackavail = "); ultoa((dword)stackavail(),str,10); strcat(scratch,str); strcat(scratch,"\n"); - write(heaphandle,scratch,strlen(scratch)); - HC_CloseDebug(); + write(gvar->handle.heaphandle,scratch,strlen(scratch)); + HC_CloseDebug(gvar); } -void heapstat(int heap_status, byte *str) +void heapstat(global_game_variables_t *gvar, int heap_status, byte *str) { switch( heap_status ) { case _HEAPEND: @@ -489,7 +487,7 @@ void heapstat(int heap_status, byte *str) case _HEAPBADNODE: strcpy((str),"ERROR - bad node in heap\n"); } - write(heaphandle,(str),strlen((str))); + write(gvar->handle.heaphandle,(str),strlen((str))); } void heapstat0(int heap_status) @@ -500,7 +498,6 @@ void heapstat0(int heap_status) break; case _HEAPEMPTY: //printf("OK - heap is empty\n"); - break; case _HEAPBADBEGIN: printf("ERROR - heap is damaged\n"); @@ -522,13 +519,13 @@ void heapstat0(int heap_status) = ============================ */ -void HC_OpenDebug() +void HC_OpenDebug(global_game_variables_t *gvar) { unlink("heap.16"); - heaphandle = open("heap.16", O_CREAT | O_WRONLY | O_TEXT); + gvar->handle.heaphandle = open("heap.16", O_CREAT | O_WRONLY | O_TEXT); } -void HC_CloseDebug() +void HC_CloseDebug(global_game_variables_t *gvar) { - close(heaphandle); + close(gvar->handle.heaphandle); } diff --git a/src/lib/16_hc.h b/src/lib/16_hc.h index db0265a8..6e947bee 100644 --- a/src/lib/16_hc.h +++ b/src/lib/16_hc.h @@ -28,8 +28,6 @@ #include "src/lib/16_head.h" -extern int heaphandle; - #ifdef __BORLANDC__ void * LargestFreeBlock(size_t* Size); #endif @@ -46,11 +44,11 @@ size_t _hugecoreleft(void); size_t GetFreeSize(void); size_t GetFarFreeSize(void); size_t GetNearFreeSize(void); -void heapdump(void); -void heapstat(int heap_status, byte *str); +void heapdump(global_game_variables_t *gvar); +void heapstat(global_game_variables_t *gvar, int heap_status, byte *str); void heapstat0(int heap_status); -void HC_OpenDebug(); -void HC_CloseDebug(); +void HC_OpenDebug(global_game_variables_t *gvar); +void HC_CloseDebug(global_game_variables_t *gvar); #endif /* __16HC__ */ diff --git a/src/lib/16_head.h b/src/lib/16_head.h index 39f16ae8..665c4fb2 100644 --- a/src/lib/16_head.h +++ b/src/lib/16_head.h @@ -176,6 +176,13 @@ typedef void __based(__self) * memptr; #ifdef __BORLANDC__ typedef void _seg * memptr; #endif + +typedef struct +{ + int profilehandle,debughandle; + int heaphandle; +} handle_t; + typedef struct { int old_mode; //old video mode before game! @@ -183,8 +190,7 @@ typedef struct clock_t t; dword tiku; word far* clock; - //handles for log files of the game gose here if wwww - //int heaphandle; + handle_t handle; //handles for file logging } global_game_variables_t; /* local function */ @@ -194,7 +200,7 @@ long int filesize(FILE *fp); void printmeminfoline(byte *strc, const byte *pee, size_t h_total, size_t h_used, size_t h_free); int US_CheckParm(char *parm,char **strings); -extern void CA_OpenDebug (void); -extern void CA_CloseDebug (void); +extern void CA_OpenDebug (global_game_variables_t *gvar); +extern void CA_CloseDebug (global_game_variables_t *gvar); #endif/*_LIBHEAD_H_*/ diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c index ba29d60c..78f00337 100644 --- a/src/lib/16_mm.c +++ b/src/lib/16_mm.c @@ -1011,7 +1011,7 @@ printf("\n"); if (mm->bombonerror) { #ifdef __WATCOMC__ - heapdump(); + //heapdump(); #endif printf(OUT_OF_MEM_MSG,(size-mmi->nearheap)); printf("for stability reasons the program will shut down! wwww\n"); @@ -1264,7 +1264,7 @@ void MM_SortMem(mminfo_t *mm) ===================== */ -void MM_ShowMemory(/*page_t *page, */mminfo_t *mm) +void MM_ShowMemory(global_game_variables_t *gvar,/*page_t *page, */mminfo_t *mm) { mmblocktype huge *scan; //++++ word color; @@ -1283,7 +1283,7 @@ void MM_ShowMemory(/*page_t *page, */mminfo_t *mm) end = -1; -CA_OpenDebug (); +CA_OpenDebug (gvar); //++++ chx=0; //++++ chy=0; @@ -1299,7 +1299,7 @@ CA_OpenDebug (); if(scan->start<=end) { //printf("); - write(debughandle,"\nMM_ShowMemory: Memory block order currupted!\n",strlen("\nMM_ShowMemory: Memory block order currupted!\n")); + write(gvar->handle.debughandle,"\nMM_ShowMemory: Memory block order currupted!\n",strlen("\nMM_ShowMemory: Memory block order currupted!\n")); //modexprint(&page, chx, chy, 1, 0, 24, "\nMM_ShowMemory: Memory block order currupted!\n"); return; } @@ -1348,7 +1348,7 @@ owner = (unsigned)scan->useptr; ultoa (owner,str,16); strcat (scratch,str); strcat (scratch,"\n"); -write(debughandle,scratch,strlen(scratch)); +write(gvar->handle.debughandle,scratch,strlen(scratch)); //modexprint(page, chx, chy, 1, 0, 24, &scratch); //++++chy+=4; //fprintf(stdout, "%s", scratch); @@ -1357,7 +1357,7 @@ write(debughandle,scratch,strlen(scratch)); scan = scan->next; } -CA_CloseDebug (); +CA_CloseDebug (gvar); //++++mh IN_Ack(); //**** VW_SetLineWidth(64); diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h index 49a943fc..2e012302 100644 --- a/src/lib/16_mm.h +++ b/src/lib/16_mm.h @@ -187,7 +187,7 @@ void MM_FreePtr(memptr *baseptr, mminfo_t *mm); void MM_SetPurge(memptr *baseptr, int purge, mminfo_t *mm); void MM_SetLock(memptr *baseptr, boolean locked, mminfo_t *mm); void MM_SortMem(mminfo_t *mm); -void MM_ShowMemory(/*page_t *page, */mminfo_t *mm); +void MM_ShowMemory(global_game_variables_t *gvar,/*page_t *page, */mminfo_t *mm); void MM_DumpData(mminfo_t *mm); dword MM_UnusedMemory(mminfo_t *mm); dword MM_TotalFree(mminfo_t *mm); -- 2.39.2