Code-style consistency improvement:
Apply clang-format-all.sh using the _clang-format file through all the cpp/.h files. make sure not to apply it to certain serialization structures, since some parser expects the * as part of the name, instead of type. This commit contains no other changes aside from adding and applying clang-format-all.sh
This commit is contained in:
@@ -8,27 +8,24 @@
|
||||
#include <stdio.h>
|
||||
//see also https://msdn.microsoft.com/en-us/library/windows/desktop/aa366551%28v=vs.85%29.aspx
|
||||
|
||||
|
||||
struct Win32SharedMemorySegment
|
||||
{
|
||||
int m_key;
|
||||
HANDLE m_hMapFile;
|
||||
void* m_buf;
|
||||
void* m_buf;
|
||||
TCHAR m_szName[1024];
|
||||
|
||||
Win32SharedMemorySegment()
|
||||
:m_hMapFile(0),
|
||||
m_buf(0),
|
||||
m_key(-1)
|
||||
: m_hMapFile(0),
|
||||
m_buf(0),
|
||||
m_key(-1)
|
||||
{
|
||||
m_szName[0] = 0;
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
struct Win32SharedMemoryInteralData
|
||||
{
|
||||
|
||||
b3AlignedObjectArray<Win32SharedMemorySegment> m_segments;
|
||||
|
||||
Win32SharedMemoryInteralData()
|
||||
@@ -45,95 +42,91 @@ Win32SharedMemory::~Win32SharedMemory()
|
||||
delete m_internalData;
|
||||
}
|
||||
|
||||
void* Win32SharedMemory::allocateSharedMemory(int key, int size, bool allowCreation)
|
||||
void* Win32SharedMemory::allocateSharedMemory(int key, int size, bool allowCreation)
|
||||
{
|
||||
{
|
||||
|
||||
Win32SharedMemorySegment* seg = 0;
|
||||
int i=0;
|
||||
|
||||
for (i=0;i<m_internalData->m_segments.size();i++)
|
||||
{
|
||||
if (m_internalData->m_segments[i].m_key == key)
|
||||
{
|
||||
seg = &m_internalData->m_segments[i];
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (seg)
|
||||
{
|
||||
b3Error("already created shared memory segment using same key");
|
||||
return seg->m_buf;
|
||||
}
|
||||
Win32SharedMemorySegment* seg = 0;
|
||||
int i = 0;
|
||||
|
||||
}
|
||||
for (i = 0; i < m_internalData->m_segments.size(); i++)
|
||||
{
|
||||
if (m_internalData->m_segments[i].m_key == key)
|
||||
{
|
||||
seg = &m_internalData->m_segments[i];
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (seg)
|
||||
{
|
||||
b3Error("already created shared memory segment using same key");
|
||||
return seg->m_buf;
|
||||
}
|
||||
}
|
||||
|
||||
Win32SharedMemorySegment seg;
|
||||
seg.m_key = key;
|
||||
#ifdef UNICODE
|
||||
swprintf_s (seg.m_szName,TEXT("MyFileMappingObject%d"),key);
|
||||
swprintf_s(seg.m_szName, TEXT("MyFileMappingObject%d"), key);
|
||||
#else
|
||||
|
||||
sprintf(seg.m_szName,"MyFileMappingObject%d",key);
|
||||
|
||||
sprintf(seg.m_szName, "MyFileMappingObject%d", key);
|
||||
#endif
|
||||
|
||||
|
||||
seg.m_hMapFile = OpenFileMapping(
|
||||
FILE_MAP_ALL_ACCESS, // read/write access
|
||||
FALSE, // do not inherit the name
|
||||
seg.m_szName); // name of mapping object
|
||||
FILE_MAP_ALL_ACCESS, // read/write access
|
||||
FALSE, // do not inherit the name
|
||||
seg.m_szName); // name of mapping object
|
||||
|
||||
if (seg.m_hMapFile==NULL)
|
||||
if (seg.m_hMapFile == NULL)
|
||||
{
|
||||
if (allowCreation)
|
||||
{
|
||||
seg.m_hMapFile = CreateFileMapping(
|
||||
INVALID_HANDLE_VALUE, // use paging file
|
||||
NULL, // default security
|
||||
PAGE_READWRITE, // read/write access
|
||||
0, // maximum object size (high-order DWORD)
|
||||
size, // maximum object size (low-order DWORD)
|
||||
seg.m_szName); // name of mapping object
|
||||
} else
|
||||
{
|
||||
b3Warning("Could not create file mapping object (%d).\n",GetLastError());
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (allowCreation)
|
||||
{
|
||||
seg.m_hMapFile = CreateFileMapping(
|
||||
INVALID_HANDLE_VALUE, // use paging file
|
||||
NULL, // default security
|
||||
PAGE_READWRITE, // read/write access
|
||||
0, // maximum object size (high-order DWORD)
|
||||
size, // maximum object size (low-order DWORD)
|
||||
seg.m_szName); // name of mapping object
|
||||
}
|
||||
else
|
||||
{
|
||||
b3Warning("Could not create file mapping object (%d).\n", GetLastError());
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
seg.m_buf = MapViewOfFile(seg.m_hMapFile, // handle to map object
|
||||
FILE_MAP_ALL_ACCESS, // read/write permission
|
||||
0,
|
||||
0,
|
||||
size);
|
||||
seg.m_buf = MapViewOfFile(seg.m_hMapFile, // handle to map object
|
||||
FILE_MAP_ALL_ACCESS, // read/write permission
|
||||
0,
|
||||
0,
|
||||
size);
|
||||
|
||||
if (seg.m_buf == NULL)
|
||||
if (seg.m_buf == NULL)
|
||||
{
|
||||
b3Warning("Could not map view of file (%d).\n",GetLastError());
|
||||
b3Warning("Could not map view of file (%d).\n", GetLastError());
|
||||
CloseHandle(seg.m_hMapFile);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
m_internalData->m_segments.push_back(seg);
|
||||
return seg.m_buf;
|
||||
m_internalData->m_segments.push_back(seg);
|
||||
return seg.m_buf;
|
||||
}
|
||||
void Win32SharedMemory::releaseSharedMemory(int key, int size)
|
||||
{
|
||||
Win32SharedMemorySegment* seg = 0;
|
||||
int i = 0;
|
||||
|
||||
Win32SharedMemorySegment* seg = 0;
|
||||
int i=0;
|
||||
|
||||
for (i=0;i<m_internalData->m_segments.size();i++)
|
||||
{
|
||||
if (m_internalData->m_segments[i].m_key == key)
|
||||
{
|
||||
seg = &m_internalData->m_segments[i];
|
||||
break;
|
||||
}
|
||||
}
|
||||
for (i = 0; i < m_internalData->m_segments.size(); i++)
|
||||
{
|
||||
if (m_internalData->m_segments[i].m_key == key)
|
||||
{
|
||||
seg = &m_internalData->m_segments[i];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (seg==0)
|
||||
if (seg == 0)
|
||||
{
|
||||
b3Error("Couldn't find shared memory segment");
|
||||
return;
|
||||
@@ -142,7 +135,7 @@ void Win32SharedMemory::releaseSharedMemory(int key, int size)
|
||||
if (seg->m_buf)
|
||||
{
|
||||
UnmapViewOfFile(seg->m_buf);
|
||||
seg->m_buf=0;
|
||||
seg->m_buf = 0;
|
||||
}
|
||||
|
||||
if (seg->m_hMapFile)
|
||||
@@ -164,8 +157,8 @@ Win32SharedMemoryServer::~Win32SharedMemoryServer()
|
||||
Win32SharedMemoryClient::Win32SharedMemoryClient()
|
||||
{
|
||||
}
|
||||
Win32SharedMemoryClient:: ~Win32SharedMemoryClient()
|
||||
Win32SharedMemoryClient::~Win32SharedMemoryClient()
|
||||
{
|
||||
}
|
||||
|
||||
#endif //_WIN32
|
||||
#endif //_WIN32
|
||||
|
||||
Reference in New Issue
Block a user