summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAditya Mandaleeka <adityamandaleeka@users.noreply.github.com>2015-11-03 14:28:58 -0800
committerAditya Mandaleeka <adityamandaleeka@users.noreply.github.com>2015-11-03 14:28:58 -0800
commit1bdad57bd28d24072c0f7771f8ce1e39b4de43c8 (patch)
tree9f396ea86139bb0f7e8674e0ebc9d4b4be3a2107 /src
parent9f0c461bb15b75c839825b4956e8725a205280fc (diff)
parentf11fe18798a532bbe6222d05f3f70b3e27dec82e (diff)
downloadcoreclr-1bdad57bd28d24072c0f7771f8ce1e39b4de43c8.tar.gz
coreclr-1bdad57bd28d24072c0f7771f8ce1e39b4de43c8.tar.bz2
coreclr-1bdad57bd28d24072c0f7771f8ce1e39b4de43c8.zip
Merge pull request #1940 from adityamandaleeka/remove_suspension
Clean up PAL File functions
Diffstat (limited to 'src')
-rw-r--r--src/pal/src/cruntime/filecrt.cpp219
-rw-r--r--src/pal/src/cruntime/printfcpp.cpp8
-rw-r--r--src/pal/src/debug/debug.cpp6
-rw-r--r--src/pal/src/file/file.cpp32
-rw-r--r--src/pal/src/include/pal/file.h17
-rw-r--r--src/pal/src/include/pal/file.hpp83
-rw-r--r--src/pal/src/map/map.cpp11
-rw-r--r--src/pal/src/misc/dbgmsg.cpp13
-rw-r--r--src/pal/src/synchmgr/synchmanager.cpp14
9 files changed, 77 insertions, 326 deletions
diff --git a/src/pal/src/cruntime/filecrt.cpp b/src/pal/src/cruntime/filecrt.cpp
index f7cc20f592..790a262670 100644
--- a/src/pal/src/cruntime/filecrt.cpp
+++ b/src/pal/src/cruntime/filecrt.cpp
@@ -96,7 +96,7 @@ _open_osfhandle( INT_PTR osfhandle, int flags )
{
if ('\0' != pLocalData->unix_filename[0])
{
- nRetVal = InternalOpen(pthrCurrent, pLocalData->unix_filename, openFlags);
+ nRetVal = InternalOpen(pLocalData->unix_filename, openFlags);
}
else /* the only file object with no unix_filename is a pipe */
{
@@ -153,7 +153,7 @@ PAL_fflush( PAL_FILE *stream )
PERF_ENTRY(fflush);
ENTRY( "fflush( %p )\n", stream );
- nRetVal = InternalFflush(InternalGetCurrentThread(), stream ? stream->bsdFilePtr : NULL);
+ nRetVal = fflush(stream ? stream->bsdFilePtr : NULL);
LOGEXIT( "fflush returning %d\n", nRetVal );
PERF_EXIT(fflush);
@@ -162,36 +162,9 @@ PAL_fflush( PAL_FILE *stream )
/*++
-Function:
- InternalFflush
-
-Wrapper for fflush. If stream points to an output stream or an
-update stream, fflush causes any unwritten data for that stream
-to be written to the file.
-
-InternalFflush is called in DBG_printf_gcc and DBG_printf_c99,
-in dbgmsg.cpp. We can do this since InternalFflush doesn't use
-ENTRY/LOGEXIT macros, which would cause a recursion otherwise.
-
-fflush takes an internal lock so the thread calling it
-should not be suspended while inside it.
---*/
-int
-CorUnix::InternalFflush(
- CPalThread *pthrCurrent,
- FILE *stream
- )
-{
- int nRet = 0;
- nRet = fflush(stream);
- return nRet;
-}
-
-
-/*++
PAL__getcwd
-Wrapper function for InternalGetcwd.
+Wrapper function for getcwd.
Input parameters:
@@ -209,45 +182,7 @@ PAL__getcwd(
size_t nSize
)
{
- return InternalGetcwd(InternalGetCurrentThread(), szBuf, nSize);
-}
-
-
-/*++
-InternalGetcwd
-
-Wrapper for getcwd. getcwd returns a pointer to the current directory pathname.
-getcwd invokes malloc when szBuf is NULL to allocate space to store the path name.
-
-Input parameters:
-
-szBuf = a copy of the absolute pathname of the current working directory
-is copied into szBuf.
-nSize = size, in bytes, of the array referenced by szBuf.
-
-Return value:
- A pointer to the pathname if successful, otherwise NULL is returned
- and errno is set.
---*/
-char *
-CorUnix::InternalGetcwd(
- CPalThread *pthrCurrent,
- char *szBuf,
- size_t nSize
- )
-{
- char *szBufCopy;
- if (szBuf == NULL)
- {
- // malloc is used to allocate space to store the pathname when szBuf is NULL.
- szBufCopy = (char *)getcwd(szBuf, nSize);
- }
- else
- {
- szBufCopy = (char *)getcwd(szBuf, nSize);
- }
-
- return szBufCopy;
+ return (char *)getcwd(szBuf, nSize);
}
@@ -267,20 +202,16 @@ int
__cdecl
PAL_mkstemp(char *szNameTemplate)
{
- return InternalMkstemp(InternalGetCurrentThread(), szNameTemplate);
+ return InternalMkstemp(szNameTemplate);
}
/*++
InternalMkstemp
-Wrapper for mkstemp. mkstemp may invoke malloc, in which case a thread
-suspended inside it could be holding an internal lock. This function prevents
-such a suspension from occuring by ensuring that a thread cannot be suspended
-while inside mkstemp.
+Wrapper for mkstemp.
Input parameters:
-pthrCurrent = reference to executing thread
szNameTemplate = template to follow when naming the created file
Return value:
@@ -288,7 +219,6 @@ Return value:
--*/
int
CorUnix::InternalMkstemp(
- CPalThread *pthrCurrent,
char *szNameTemplate
)
{
@@ -336,21 +266,17 @@ PAL__open(
va_end(ap);
}
- nRet = InternalOpen(InternalGetCurrentThread(), szPath, nFlags, mode);
+ nRet = InternalOpen(szPath, nFlags, mode);
return nRet;
}
/*++
InternalOpen
-Wrapper for open. open can take a internal file lock, in which case a thread
-suspended inside it could be holding an internal lock. This function prevents
-such a suspension from occuring by ensuring that a thread cannot be suspended
-while inside open.
+Wrapper for open.
Input parameters:
-pthrCurrent = reference to executing thread
szPath = pointer to a pathname of a file to be opened
nFlags = arguments that control how the file should be accessed
mode = file permission settings that are used only when a file is created
@@ -360,7 +286,6 @@ Return value:
--*/
int
CorUnix::InternalOpen(
- CPalThread *pthrCurrent,
const char *szPath,
int nFlags,
...
@@ -390,7 +315,7 @@ CorUnix::InternalOpen(
/*++
PAL_unlink
-Wrapper function for InternalUnlink.
+Wrapper function for unlink.
Input parameters:
@@ -403,46 +328,18 @@ int
__cdecl
PAL_unlink(const char *szPath)
{
- return InternalUnlink(InternalGetCurrentThread(), szPath);
-}
-
-/*++
-InternalUnlink
-
-Wrapper for unlink. unlink can take a internal file lock, in which case a thread
-suspended inside it could be holding an internal lock. This function prevents
-such a suspension from occuring by ensuring that a thread cannot be suspended
-while inside unlink.
-
-Input parameters:
-
-pthrCurrent = reference to executing thread
-szPath = a symbolic link or a hard link to a file
-
-Return value:
- Returns 0 on success and -1 on failure
---*/
-int
-CorUnix::InternalUnlink(
- CPalThread *pthrCurrent,
- const char *szPath
- )
-{
- int nRet = -1;
- nRet = unlink(szPath);
- return nRet;
+ return unlink(szPath);
}
/*++
InternalDeleteFile
-Wrapper that does the same thing as InternalUnlink, except that
+Wrapper that does the same thing as unlink, except that
it uses the SYS_Delete system call present on Apple instead of unlink.
Input parameters:
-pthrCurrent = reference to executing thread
szPath = a symbolic link or a hard link to a file
Return value:
@@ -450,7 +347,6 @@ Return value:
--*/
int
CorUnix::InternalDeleteFile(
- CPalThread *pthrCurrent,
const char *szPath
)
{
@@ -467,7 +363,7 @@ CorUnix::InternalDeleteFile(
/*++
PAL_rename
-Wrapper function for InternalRename.
+Wrapper function for rename.
Input parameters:
@@ -484,37 +380,9 @@ PAL_rename(
const char *szNewName
)
{
- return InternalRename(InternalGetCurrentThread(), szOldName, szNewName);
+ return rename(szOldName, szNewName);
}
-/*++
-InternalRename
-
-Wrapper for rename. rename can take a internal file lock, in which case a thread
-suspended inside it could be holding an internal lock. This function prevents
-such a suspension from occuring by ensuring that a thread cannot be suspended
-while inside rename.
-
-Input parameters:
-
-pthrCurrent = reference to executing thread
-szOldName = pointer to the pathname of the file to be renamed
-szNewName = pointer to the new pathname of the file
-
-Return value:
- Returns 0 on success and -1 on failure
---*/
-int
-CorUnix::InternalRename(
- CPalThread *pthrCurrent,
- const char *szOldName,
- const char *szNewName
- )
-{
- int nRet = -1;
- nRet = rename(szOldName, szNewName);
- return nRet;
-}
/*++
PAL_fgets
@@ -546,7 +414,7 @@ PAL_fgets(
if (pf != NULL)
{
- szBuf = InternalFgets(InternalGetCurrentThread(), sz, nSize, pf->bsdFilePtr, pf->bTextMode);
+ szBuf = InternalFgets(sz, nSize, pf->bsdFilePtr, pf->bTextMode);
}
else
{
@@ -562,14 +430,10 @@ PAL_fgets(
/*++
InternalFgets
-Wrapper for fgets. fgets can take a internal file lock, in which case a thread
-suspended inside it could be holding an internal lock. This function prevents
-such a suspension from occuring by ensuring that a thread cannot be suspended
-while inside fgets.
+Wrapper for fgets.
Input parameters:
-pthrCurrent = reference to executing thread
sz = stores characters read from the given file stream
nSize = number of characters to be read
f = stream to read characters from
@@ -586,7 +450,6 @@ happens, it is SOP to call fgets again.
--*/
char *
CorUnix::InternalFgets(
- CPalThread *pthrCurrent,
char *sz,
int nSize,
FILE *f,
@@ -670,7 +533,7 @@ PAL_fwrite(
pvBuffer, nSize, nCount, pf);
_ASSERTE(pf != NULL);
- nWrittenBytes = InternalFwrite(InternalGetCurrentThread(), pvBuffer, nSize, nCount, pf->bsdFilePtr, &pf->PALferrorCode);
+ nWrittenBytes = InternalFwrite(pvBuffer, nSize, nCount, pf->bsdFilePtr, &pf->PALferrorCode);
LOGEXIT( "fwrite returning size_t %d\n", nWrittenBytes );
PERF_EXIT(fwrite);
@@ -680,14 +543,10 @@ PAL_fwrite(
/*++
InternalFwrite
-Wrapper for fwrite. fwrite can take a internal file lock, in which case a thread
-suspended inside it could be holding an internal lock. This function prevents
-such a suspension from occuring by ensuring that a thread cannot be suspended
-while inside fwrite.
+Wrapper for fwrite.
Input parameters:
-pthrCurrent = reference to executing thread
pvBuffer = array of objects to write to the given file stream
nSize = size of a object in bytes
nCount = number of objects to write
@@ -699,10 +558,9 @@ Return value:
--*/
size_t
CorUnix::InternalFwrite(
- CPalThread *pthrCurrent,
- const void *pvBuffer,
- size_t nSize,
- size_t nCount,
+ const void *pvBuffer,
+ size_t nSize,
+ size_t nCount,
FILE *f,
INT *pnErrorCode
)
@@ -730,7 +588,7 @@ CorUnix::InternalFwrite(
/*++
PAL_fseek
-Wrapper function for InternalFseek.
+Wrapper function for fseek.
Input parameters:
@@ -754,42 +612,9 @@ PAL_fseek(
PERF_ENTRY(fseek);
ENTRY( "fseek( %p, %ld, %d )\n", pf, lOffset, nWhence );
- nRet = InternalFseek(InternalGetCurrentThread(), pf ? pf->bsdFilePtr : NULL, lOffset, nWhence);
+ nRet = fseek(pf ? pf->bsdFilePtr : NULL, lOffset, nWhence);
LOGEXIT("fseek returning %d\n", nRet);
PERF_EXIT(fseek);
return nRet;
}
-
-/*++
-InternalFseek
-
-Wrapper for fseek. fseek can take a internal file lock, in which case a thread
-suspended inside it could be holding an internal lock. This function prevents
-such a suspension from occuring by ensuring that a thread cannot be suspended
-while inside fseek.
-
-Input parameters:
-
-pthrCurrent = reference to executing thread
-f = a given file stream
-lOffset = distance from position to set file-position indicator
-nWhence = method used to determine the file_position indicator location relative to lOffset
-
-Return value:
- 0 on success, -1 on failure.
---*/
-int
-CorUnix::InternalFseek(
- CPalThread *pthrCurrent,
- FILE *f,
- long lOffset,
- int nWhence
- )
-{
- int nRet = -1;
- _ASSERTE(f != NULL);
-
- nRet = fseek(f, lOffset, nWhence);
- return nRet;
-}
diff --git a/src/pal/src/cruntime/printfcpp.cpp b/src/pal/src/cruntime/printfcpp.cpp
index 4114061d7d..24a12d3e95 100644
--- a/src/pal/src/cruntime/printfcpp.cpp
+++ b/src/pal/src/cruntime/printfcpp.cpp
@@ -84,7 +84,7 @@ static int Internal_Convertfwrite(CPalThread *pthrCurrent, const void *buffer, s
InternalFree(newBuff);
return -1;
}
- ret = InternalFwrite(pthrCurrent, newBuff, 1, count, stream, &iError);
+ ret = InternalFwrite(newBuff, 1, count, stream, &iError);
if (iError != 0)
{
ERROR("InternalFwrite did not write the whole buffer. Error is %d\n", iError);
@@ -95,7 +95,7 @@ static int Internal_Convertfwrite(CPalThread *pthrCurrent, const void *buffer, s
}
else
{
- ret = InternalFwrite(pthrCurrent, buffer, size, count, stream, &iError);
+ ret = InternalFwrite(buffer, size, count, stream, &iError);
if (iError != 0)
{
ERROR("InternalFwrite did not write the whole buffer. Error is %d\n", iError);
@@ -941,7 +941,7 @@ INT Internal_AddPaddingVfprintf(CPalThread *pthrCurrent, PAL_FILE *stream, LPSTR
clearerr (stream->bsdFilePtr);
#endif
- Written = InternalFwrite(pthrCurrent, OutOriginal, 1, Length, stream->bsdFilePtr, &stream->PALferrorCode);
+ Written = InternalFwrite(OutOriginal, 1, Length, stream->bsdFilePtr, &stream->PALferrorCode);
if (stream->PALferrorCode == PAL_FILE_ERROR)
{
ERROR("fwrite() failed with errno == %d\n", errno);
@@ -2542,7 +2542,7 @@ int CoreVfprintf(CPalThread *pthrCurrent, PAL_FILE *stream, const char *format,
clearerr (stream->bsdFilePtr);
#endif
- InternalFwrite(pthrCurrent, Fmt++, 1, 1, stream->bsdFilePtr, &stream->PALferrorCode); /* copy regular chars into buffer */
+ InternalFwrite(Fmt++, 1, 1, stream->bsdFilePtr, &stream->PALferrorCode); /* copy regular chars into buffer */
if (stream->PALferrorCode == PAL_FILE_ERROR)
{
ERROR("fwrite() failed with errno == %d\n", errno);
diff --git a/src/pal/src/debug/debug.cpp b/src/pal/src/debug/debug.cpp
index 48d54fdda1..6a09e84fb1 100644
--- a/src/pal/src/debug/debug.cpp
+++ b/src/pal/src/debug/debug.cpp
@@ -682,7 +682,7 @@ ReadProcessMemory(
#else // HAVE_VM_READ
#if HAVE_PROCFS_CTL
snprintf(memPath, sizeof(memPath), "/proc/%u/%s", processId, PROCFS_MEM_NAME);
- fd = InternalOpen(pThread, memPath, O_RDONLY);
+ fd = InternalOpen(memPath, O_RDONLY);
if (fd == -1)
{
ERROR("Failed to open %s\n", memPath);
@@ -957,7 +957,7 @@ WriteProcessMemory(
#else // HAVE_VM_READ
#if HAVE_PROCFS_CTL
snprintf(memPath, sizeof(memPath), "/proc/%u/%s", processId, PROCFS_MEM_NAME);
- fd = InternalOpen(pThread, memPath, O_WRONLY);
+ fd = InternalOpen(memPath, O_WRONLY);
if (fd == -1)
{
ERROR("Failed to open %s\n", memPath);
@@ -1280,7 +1280,7 @@ DBGAttachProcess(
nanosleep(&waitTime, NULL);
sprintf_s(ctlPath, sizeof(ctlPath), "/proc/%d/ctl", processId);
- fd = InternalOpen(pThread, ctlPath, O_WRONLY);
+ fd = InternalOpen(ctlPath, O_WRONLY);
if (fd == -1)
{
ERROR("Failed to open %s: errno is %d (%s)\n", ctlPath,
diff --git a/src/pal/src/file/file.cpp b/src/pal/src/file/file.cpp
index d3953e5e87..315687366f 100644
--- a/src/pal/src/file/file.cpp
+++ b/src/pal/src/file/file.cpp
@@ -246,12 +246,12 @@ InternalCanonicalizeRealPath
realpath() requires the buffer to be atleast PATH_MAX).
--*/
PAL_ERROR
-CorUnix::InternalCanonicalizeRealPath(CPalThread *pThread, LPCSTR lpUnixPath, LPSTR lpBuffer, DWORD cch)
+CorUnix::InternalCanonicalizeRealPath(LPCSTR lpUnixPath, LPSTR lpBuffer, DWORD cch)
{
PAL_ERROR palError = NO_ERROR;
LPSTR lpRealPath = NULL;
-#if !REALPATH_SUPPORTS_NONEXISTENT_FILES
+#if !REALPATH_SUPPORTS_NONEXISTENT_FILES
LPSTR lpExistingPath = NULL;
LPSTR pchSeparator = NULL;
LPSTR lpFilename = NULL;
@@ -284,9 +284,9 @@ CorUnix::InternalCanonicalizeRealPath(CPalThread *pThread, LPCSTR lpUnixPath, LP
char pszCwdBuffer[MAXPATHLEN+1]; // MAXPATHLEN is for getcwd()
DWORD cchCwdBuffer = sizeof(pszCwdBuffer)/sizeof(pszCwdBuffer[0]);
- if (InternalGetcwd(pThread, pszCwdBuffer, cchCwdBuffer) == NULL)
+ if (getcwd(pszCwdBuffer, cchCwdBuffer) == NULL)
{
- WARN("InternalGetcwd(NULL) failed with error %d\n", errno);
+ WARN("getcwd(NULL) failed with error %d\n", errno);
palError = DIRGetLastErrorFromErrno();
goto LExit;
}
@@ -484,8 +484,8 @@ CorUnix::InternalCreateFile(
const char* szNonfilePrefix = "\\\\.\\";
LPSTR lpFullUnixPath = NULL;
- DWORD cchFullUnixPath = PATH_MAX+1;// InternalCanonicalizeRealPath requires this to be atleast PATH_MAX
-
+ DWORD cchFullUnixPath = PATH_MAX+1; // InternalCanonicalizeRealPath requires this to be atleast PATH_MAX
+
/* for dwShareMode only three flags are accepted */
if ( dwShareMode & ~(FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE) )
{
@@ -539,7 +539,7 @@ CorUnix::InternalCreateFile(
// Compute the absolute pathname to the file. This pathname is used
// to determine if two file names represent the same file.
- palError = InternalCanonicalizeRealPath(pThread, lpUnixPath, lpFullUnixPath, cchFullUnixPath);
+ palError = InternalCanonicalizeRealPath(lpUnixPath, lpFullUnixPath, cchFullUnixPath);
if (palError != NO_ERROR)
{
goto done;
@@ -692,7 +692,7 @@ CorUnix::InternalCreateFile(
TRACE("I/O will be buffered\n");
}
- filed = InternalOpen(pThread, lpUnixPath, open_flags, create_flags);
+ filed = InternalOpen(lpUnixPath, open_flags, create_flags);
TRACE("Allocated file descriptor [%d]\n", filed);
if ( filed < 0 )
@@ -842,7 +842,7 @@ done:
}
if (bFileCreated)
{
- if (-1 == InternalUnlink(pThread, lpUnixPath))
+ if (-1 == unlink(lpUnixPath))
{
WARN("can't delete file; unlink() failed with errno %d (%s)\n",
errno, strerror(errno));
@@ -1216,7 +1216,7 @@ DeleteFileA(
// Compute the absolute pathname to the file. This pathname is used
// to determine if two file names represent the same file.
- palError = InternalCanonicalizeRealPath(pThread, lpUnixFileName, lpFullUnixFileName, cchFullUnixFileName);
+ palError = InternalCanonicalizeRealPath(lpUnixFileName, lpFullUnixFileName, cchFullUnixFileName);
if (palError != NO_ERROR)
{
InternalFree(lpFullUnixFileName);
@@ -1243,14 +1243,14 @@ DeleteFileA(
// Instead, we call unlink which will succeed.
if (palError == NO_ERROR &&
- dwShareMode != SHARE_MODE_NOT_INITALIZED &&
- (dwShareMode & FILE_SHARE_DELETE) != 0)
+ dwShareMode != SHARE_MODE_NOT_INITALIZED &&
+ (dwShareMode & FILE_SHARE_DELETE) != 0)
{
- result = InternalUnlink( pThread, lpFullUnixFileName );
+ result = unlink( lpFullUnixFileName );
}
else
{
- result = InternalDeleteFile( pThread, lpFullUnixFileName );
+ result = InternalDeleteFile( lpFullUnixFileName );
}
if ( result < 0 )
@@ -1497,7 +1497,7 @@ MoveFileExA(
}
}
- result = InternalRename( pThread, source, dest );
+ result = rename( source, dest );
if ((result < 0) && (dwFlags & MOVEFILE_REPLACE_EXISTING) &&
((errno == ENOTDIR) || (errno == EEXIST)))
{
@@ -1505,7 +1505,7 @@ MoveFileExA(
if ( bRet )
{
- result = InternalRename( pThread, source, dest );
+ result = rename( source, dest );
}
else
{
diff --git a/src/pal/src/include/pal/file.h b/src/pal/src/include/pal/file.h
index ee4dcb231d..caf982b6c7 100644
--- a/src/pal/src/include/pal/file.h
+++ b/src/pal/src/include/pal/file.h
@@ -189,8 +189,7 @@ void FILEGetProperNotFoundError( LPSTR lpPath, LPDWORD lpErrorCode );
/*++
PAL__getcwd
-Calls InternalGetcwd to call getcwd with a thread that is marked
-as suspension unsafe.
+Calls getcwd
Input parameters:
@@ -206,8 +205,7 @@ char * __cdecl PAL__getcwd(char *szBuf, size_t nSize);
/*++
PAL_fflush
-Calls InternalFflush to call fflush with a thread that is marked
-as suspension unsafe.
+Calls fflush
Input parameters:
@@ -221,8 +219,7 @@ int _cdecl PAL_fflush( PAL_FILE *stream );
/*++
PAL_mkstemp
-Calls InternalMkstemp to call mkstemp with a thread that is marked
-as suspension unsafe.
+Calls InternalMkstemp to call mkstemp
Input parameters:
@@ -236,8 +233,7 @@ int __cdecl PAL_mkstemp(char *szNameTemplate);
/*++
PAL_unlink
-Calls InternalUnlink to call unlink with a thread that is marked
-as suspension unsafe.
+Calls unlink.
Input parameters:
@@ -251,8 +247,7 @@ int __cdecl PAL_unlink(const char *szPath);
/*++
PAL_rename
-Calls InternalRename to call rename with a thread that is marked
-as suspension unsafe.
+Calls rename
Input parameters:
@@ -317,7 +312,7 @@ int __cdecl PAL__open(const char *szPath, int nFlags, ...);
/*++
PAL_fseek
-Wrapper function for InternalFseek
+Wrapper function for fseek
Input parameters:
diff --git a/src/pal/src/include/pal/file.hpp b/src/pal/src/include/pal/file.hpp
index 0b7d4cd475..909ba6c53d 100644
--- a/src/pal/src/include/pal/file.hpp
+++ b/src/pal/src/include/pal/file.hpp
@@ -42,11 +42,11 @@ namespace CorUnix
int unix_fd;
DWORD dwDesiredAccess; /* Unix assumes files are always opened for reading.
- In Windows we can open a file for writing only */
+ In Windows we can open a file for writing only */
int open_flags; /* stores Unix file creation flags */
BOOL open_flags_deviceaccessonly;
char unix_filename[MAXPATHLEN];
- BOOL inheritable;
+ BOOL inheritable;
};
PAL_ERROR
@@ -180,82 +180,35 @@ namespace CorUnix
--*/
PAL_ERROR
InternalCanonicalizeRealPath(
- CPalThread *pThread,
LPCSTR lpUnixPath,
LPSTR lpBuffer,
DWORD cch
- );
-
- /*++
- InternalGetcwd
- Wraps getcwd so the thread calling it can't be suspended holding an internal lock.
- --*/
- char *
- InternalGetcwd(
- CPalThread *pthrCurrent,
- char *szBuf,
- size_t nSize
- );
-
- /*++
- InternalFflush
- Wraps fflush so the thread calling it can't be suspended holding an internal lock.
- --*/
- int
- InternalFflush(
- CPalThread *pthrCurrent,
- FILE * stream
);
/*++
- InternalMkstemp
- Wraps mkstemp so the thread calling it can't be suspended holding an internal lock.
+ InternalMkstemp
+ Wraps mkstemp
--*/
int
InternalMkstemp(
- CPalThread *pthrCurrent,
char *szNameTemplate
);
/*++
- InternalUnlink
- Wraps unlink so the thread calling it can't be suspended holding an internal lock.
- --*/
- int
- InternalUnlink(
- CPalThread *pthrCurrent,
- const char *szPath
- );
-
-
- /*++
InternalDeleteFile
- Wraps SYS_delete so the thread calling it can't be suspended holding an internal lock.
+ Wraps SYS_delete
--*/
int
InternalDeleteFile(
- CPalThread *pthrCurrent,
const char *szPath
);
/*++
- InternalRename
- Wraps rename so the thread calling it can't be suspended holding an internal lock.
- --*/
- int
- InternalRename(
- CPalThread *pthrCurrent,
- const char *szOldName,
- const char *szNewName
- );
-
- /*++
InternalFgets
- Wraps fgets so the thread calling it can't be suspended holding an internal lock.
+ Wraps fgets
--*/
char *
InternalFgets(
- CPalThread *pthrCurrent,
char *sz,
int nSize,
FILE *f,
@@ -264,41 +217,27 @@ namespace CorUnix
/*++
InternalFwrite
- Wraps fwrite so the thread calling it can't be suspended holding an internal lock.
+ Wraps fwrite
--*/
size_t
InternalFwrite(
- CPalThread *pthrCurrent,
- const void *pvBuffer,
- size_t nSize,
- size_t nCount,
+ const void *pvBuffer,
+ size_t nSize,
+ size_t nCount,
FILE *f,
INT *pnErrorCode
);
/*++
InternalOpen
- Wraps open so the thread calling it can't be suspended holding an internal lock.
+ Wraps open
--*/
int
InternalOpen(
- CPalThread *pthrCurrent,
const char *szFilename,
int nFlags,
...
);
-
- /*++
- InternalFseek
- Wraps fseek so the thread calling it can't be suspended holding an internal lock.
- --*/
- int
- InternalFseek(
- CPalThread *pthrCurrent,
- FILE *f,
- long lOffset,
- int nWhence
- );
}
extern "C"
diff --git a/src/pal/src/map/map.cpp b/src/pal/src/map/map.cpp
index 1bc6d44f3b..ea59b71330 100644
--- a/src/pal/src/map/map.cpp
+++ b/src/pal/src/map/map.cpp
@@ -179,7 +179,7 @@ FileMappingCleanupRoutine(
if (pImmutableData->bPALCreatedTempFile)
{
- InternalUnlink(pThread, pImmutableData->szFileName);
+ unlink(pImmutableData->szFileName);
}
}
@@ -240,7 +240,6 @@ FileMappingInitializationRoutine(
reinterpret_cast<CFileMappingProcessLocalData *>(pvProcessLocalData);
pProcessLocalData->UnixFd = InternalOpen(
- pThread,
pImmutableData->szFileName,
MAPProtectionToFileOpenFlags(pImmutableData->flProtect)
);
@@ -506,7 +505,7 @@ CorUnix::InternalCreateFileMapping(
#if HAVE_MMAP_DEV_ZERO
- UnixFd = InternalOpen(pThread, pImmutableData->szFileName, O_RDWR);
+ UnixFd = InternalOpen(pImmutableData->szFileName, O_RDWR);
if ( -1 == UnixFd )
{
ERROR( "Unable to open the file.\n");
@@ -767,7 +766,7 @@ ExitInternalCreateFileMapping:
if (bPALCreatedTempFile)
{
- InternalUnlink(pThread, pImmutableData->szFileName);
+ unlink(pImmutableData->szFileName);
}
if (-1 != UnixFd)
@@ -784,9 +783,9 @@ ExitInternalCreateFileMapping:
if (NULL != pFileObject)
{
pFileObject->ReleaseReference(pThread);
- }
+ }
- return palError;
+ return palError;
}
/*++
diff --git a/src/pal/src/misc/dbgmsg.cpp b/src/pal/src/misc/dbgmsg.cpp
index ff38b1bef0..4d345649b1 100644
--- a/src/pal/src/misc/dbgmsg.cpp
+++ b/src/pal/src/misc/dbgmsg.cpp
@@ -547,17 +547,14 @@ int DBG_printf_gcc(DBG_CHANNEL_ID channel, DBG_LEVEL_ID level, BOOL bHeader,
InternalLeaveCriticalSection(pthrCurrent, &fprintf_crit_section);
/* flush the output to file */
- /* Can call InternalFflush since InternalFflush does not have ENTRY/LOGEXIT
- macros. If that changes, then this will need to be switched back to calling the
- cruntime fflush with some other protection from suspension. */
- if (InternalFflush(pthrCurrent, output_file) != 0)
+ if ( fflush(output_file) != 0 )
{
fprintf(stderr, "ERROR : fflush() failed errno:%d (%s)\n",
errno, strerror(errno));
}
// Some systems support displaying a GUI dialog. We attempt this only for asserts.
- if (level == DLI_ASSERT)
+ if ( level == DLI_ASSERT )
PAL_DisplayDialog("PAL ASSERT", buffer);
if ( old_errno != errno )
@@ -657,11 +654,7 @@ int DBG_printf_c99(DBG_CHANNEL_ID channel, DBG_LEVEL_ID level, BOOL bHeader,
if(call_count>5)
{
call_count=0;
- /* Can call InternalFflush since InternalFflush does not have
- ENTRY/LOGEXIT macros. If that changes, then this will need
- to be switched back to calling the cruntime fflush with some
- other protection from suspension. */
- if (InternalFflush(pthrCurrent, output_file) != 0)
+ if ( fflush(output_file) != 0 )
{
fprintf(stderr, "ERROR : fflush() failed errno:%d (%s)\n",
errno, strerror(errno));
diff --git a/src/pal/src/synchmgr/synchmanager.cpp b/src/pal/src/synchmgr/synchmanager.cpp
index 1a55f4f3c4..0adbb3d72e 100644
--- a/src/pal/src/synchmgr/synchmanager.cpp
+++ b/src/pal/src/synchmgr/synchmanager.cpp
@@ -2899,7 +2899,7 @@ namespace CorUnix
_ASSERT_MSG(fRet, "Failed to retrieve process pipe's name!\n");
- iProcessPipe = InternalOpen(pthrCurrent, strPipeFilename, O_WRONLY);
+ iProcessPipe = InternalOpen(strPipeFilename, O_WRONLY);
if (-1 == iProcessPipe)
{
ERROR("Unable to open a process pipe to wake up a remote thread "
@@ -3778,7 +3778,7 @@ namespace CorUnix
{
/* Some how no one deleted the pipe, perhaps it was left behind
from a crash?? Delete the pipe and try again. */
- if ( -1 == InternalUnlink( pthrCurrent, szPipeFilename ) )
+ if ( -1 == unlink( szPipeFilename ) )
{
ERROR( "Unable to delete the process pipe that was left behind.\n" );
fRet = false;
@@ -3802,7 +3802,7 @@ namespace CorUnix
}
}
- iPipeRd = InternalOpen(pthrCurrent, szPipeFilename, O_RDONLY | O_NONBLOCK);
+ iPipeRd = InternalOpen(szPipeFilename, O_RDONLY | O_NONBLOCK);
if (iPipeRd == -1)
{
ERROR("Unable to open the process pipe for read\n");
@@ -3810,7 +3810,7 @@ namespace CorUnix
goto CPP_exit;
}
- iPipeWr = InternalOpen(pthrCurrent, szPipeFilename, O_WRONLY | O_NONBLOCK);
+ iPipeWr = InternalOpen(szPipeFilename, O_WRONLY | O_NONBLOCK);
if (iPipeWr == -1)
{
ERROR("Unable to open the process pipe for write\n");
@@ -3858,7 +3858,7 @@ namespace CorUnix
// Failed
if (0 != szPipeFilename[0])
{
- InternalUnlink(pthrCurrent, szPipeFilename);
+ unlink(szPipeFilename);
}
if (-1 != iPipeRd)
{
@@ -3901,13 +3901,13 @@ namespace CorUnix
PAL_ERROR CPalSynchronizationManager::ShutdownProcessPipe(
CPalThread *pthrCurrent)
{
- PAL_ERROR palErr = NO_ERROR;
+ PAL_ERROR palErr = NO_ERROR;
#ifndef CORECLR
char szPipeFilename[MAX_PATH];
if(GetProcessPipeName(szPipeFilename, MAX_PATH, gPID))
{
- if (InternalUnlink(pthrCurrent, szPipeFilename) == -1)
+ if (unlink(szPipeFilename) == -1)
{
ERROR("Unable to unlink the pipe file name errno=%d (%s)\n",
errno, strerror(errno));