Changeset 3576 for trunk/kStuff/kLdr
- Timestamp:
- Sep 2, 2007, 10:23:54 PM (18 years ago)
- Location:
- trunk/kStuff/kLdr
- Files:
-
- 4 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/kStuff/kLdr/Makefile.kmk
r3573 r3576 119 119 kLdrDyldMod.c \ 120 120 kLdrDyldOS.c \ 121 kLdrSem.c \ 121 122 kLdrErr.c \ 122 123 kLdrMisc.c \ -
trunk/kStuff/kLdr/kLdr.c
r3573 r3576 103 103 if (!rc) 104 104 { 105 rc = k HlpSemInit();105 rc = kLdrDyldSemInit(); 106 106 if (!rc) 107 107 { … … 112 112 return 0; 113 113 } 114 k HlpSemTerm();114 kLdrDyldSemTerm(); 115 115 } 116 116 kHlpHeapTerm(); … … 134 134 * Do the termination. 135 135 */ 136 k HlpSemTerm();136 kLdrDyldSemTerm(); 137 137 kHlpHeapTerm(); 138 138 -
trunk/kStuff/kLdr/kLdrDyld.c
r3573 r3576 280 280 * Make sure we own the loader semaphore (necessary for init). 281 281 */ 282 rc = k HlpSemRequest();282 rc = kLdrDyldSemRequest(); 283 283 if (rc) 284 284 kldrDyldFailure(rc, "Sem req. failure, rc=%d", rc); … … 339 339 340 340 /* get the semaphore and do the job. */ 341 rc = k HlpSemRequest();341 rc = kLdrDyldSemRequest(); 342 342 if (!rc) 343 343 { … … 348 348 g_cActiveLoadCalls--; 349 349 kldrDyldDoModuleTerminationAndGarabageCollection(); 350 k HlpSemRelease();350 kLdrDyldSemRelease(); 351 351 *phMod = pMod ? pMod->hMod : NIL_HKLDRMOD; 352 352 } … … 369 369 370 370 /* get sem & do work */ 371 rc = k HlpSemRequest();371 rc = kLdrDyldSemRequest(); 372 372 if (!rc) 373 373 { … … 377 377 g_cActiveUnloadCalls--; 378 378 kldrDyldDoModuleTerminationAndGarabageCollection(); 379 k HlpSemRelease();379 kLdrDyldSemRelease(); 380 380 } 381 381 return rc; … … 408 408 409 409 /* get sem & do work */ 410 rc = k HlpSemRequest();410 rc = kLdrDyldSemRequest(); 411 411 if (!rc) 412 412 { 413 413 PKLDRDYLDMOD pMod = NULL; 414 414 rc = kldrDyldDoFindByName(pszDll, pszPrefix, pszSuffix, enmSearch, fFlags, &pMod); 415 k HlpSemRelease();415 kLdrDyldSemRelease(); 416 416 *phMod = pMod ? pMod->hMod : NIL_HKLDRMOD; 417 417 } … … 445 445 446 446 /* get sem & do work */ 447 rc = k HlpSemRequest();447 rc = kLdrDyldSemRequest(); 448 448 if (!rc) 449 449 { 450 450 PKLDRDYLDMOD pMod = NULL; 451 451 rc = kldrDyldDoFindByAddress(Address, &pMod, piSegment, poffSegment); 452 k HlpSemRelease();452 kLdrDyldSemRelease(); 453 453 *phMod = pMod ? pMod->hMod : NIL_HKLDRMOD; 454 454 } … … 478 478 479 479 /* get sem & do work */ 480 rc = k HlpSemRequest();480 rc = kLdrDyldSemRequest(); 481 481 if (!rc) 482 482 { 483 483 rc = kldrDyldDoGetName(hMod, pszName, cchName); 484 k HlpSemRelease();484 kLdrDyldSemRelease(); 485 485 } 486 486 return rc; … … 509 509 510 510 /* get sem & do work */ 511 rc = k HlpSemRequest();511 rc = kLdrDyldSemRequest(); 512 512 if (!rc) 513 513 { 514 514 rc = kldrDyldDoGetFilename(hMod, pszFilename, cchFilename); 515 k HlpSemRelease();515 kLdrDyldSemRelease(); 516 516 } 517 517 return rc; … … 547 547 548 548 /* get sem & do work */ 549 rc = k HlpSemRequest();549 rc = kLdrDyldSemRequest(); 550 550 if (!rc) 551 551 { 552 552 rc = kldrDyldDoQuerySymbol(hMod, uSymbolOrdinal, pszSymbolName, pValue, pfKind); 553 k HlpSemRelease();553 kLdrDyldSemRelease(); 554 554 } 555 555 return rc; -
trunk/kStuff/kLdr/kLdrInternal.h
r3573 r3576 436 436 437 437 438 /** @name The Loader semaphore 439 * @{ */ 440 int kLdrDyldSemInit(void); 441 void kLdrDyldSemTerm(void); 442 int kLdrDyldSemRequest(void); 443 void kLdrDyldSemRelease(void); 444 /** @} */ 445 446 438 447 /** @name Module interpreter method tables 439 448 * @{ */ -
trunk/kStuff/kLdr/kLdrSem.c
r3573 r3576 64 64 * @returns 0 on success, non-zero OS status code on failure. 65 65 */ 66 int k HlpSemInit(void)66 int kLdrDyldSemInit(void) 67 67 { 68 68 #if K_OS == K_OS_OS2 … … 86 86 * Terminates the loader semaphore. 87 87 */ 88 void k HlpSemTerm(void)88 void kLdrDyldSemTerm(void) 89 89 { 90 90 #if K_OS == K_OS_OS2 … … 108 108 * @returns 0 on success, non-zero OS status code on failure. 109 109 */ 110 int k HlpSemRequest(void)110 int kLdrDyldSemRequest(void) 111 111 { 112 112 #if K_OS == K_OS_OS2 … … 140 140 * The caller is responsible for making sure it's the semaphore owner! 141 141 */ 142 void k HlpSemRelease(void)142 void kLdrDyldSemRelease(void) 143 143 { 144 144 #if K_OS == K_OS_OS2
Note:
See TracChangeset
for help on using the changeset viewer.