[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-server-cvs
Subject: [Server-cvs]
From: dcollins () helixcommunity ! org
Date: 2010-04-22 15:07:47
Message-ID: 201004221507.o3MF7k08028905 () mailer ! progressive-comp ! com
[Download RAW message or body]
Update of /cvsroot/server/engine/core
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv9438/server/engine/core
Modified Files:
_main.cpp bcastmgr.cpp malloc.cpp
Log Message:
Synopsis
========
Updates to allow building in 64-bit mode on Solaris 10
Branches: SERVER_CURRENT_RN (HEAD)
Reviewer: Jamie
Description
===========
A number of minor tweaks to allow building in 64-bit mode on Solaris.
This is with Sun Studio 12.1. This will allow it to build, run and
serve HTTP connections, though it does not yet stream via RTSP.
Several places where casting operators need to be examined more
closely are flagged with TODO comments.
PTR_INT is redefined on 64-bit platforms as uintptr_t. While it could
be defined this way for all, not all 32-bit platforms define this yet,
so I left it unchanged as unsigned int for 32-bit platforms.
One source file which had a lot of casts to fix, and which is not used
on the server, was removed from the server build.
There should be little if any affect on 32-bit builds.
Files Affected
==============
client/common/util/hxpackage.cpp
common/container/hxstack.cpp
common/container/pub/hxslist.h
common/container/pub/hxstack.h
common/include/platform.h
common/netio/threngin.cpp
common/netio/unix.pcf
common_rn/include/rmadrmil.h
datatype/common/util/metautil.cpp
datatype/flash/flv/fileformat/flv_local_payload.cpp
datatype/image/common/rpparser.cpp
datatype/image/common/wirefmgr.cpp
datatype/image/jpg/import/jpeg-6b/jmorecfg.h
datatype/mp4/fileformat/qttrkmgr.cpp
datatype-restricted/rm/tools/file/crm2mix.cpp
datatype-restricted/rm/tools/file/crma2mix.cpp
datatype-restricted/rm/tools/file/rmobjwrp.cpp
datatype-restricted/rm/video/payload/crvupack.cpp
datatype/smil/renderer/smil2/smlparse.cpp
datatype/smil/renderer/smil2/smltime.cpp
protocol/rtsp/rtspclnt.cpp
protocol/rtsp/servrsnd.cpp
protocol/transport/rdt/rdttran.cpp
server/engine/core/_main.cpp
server/engine/core/pub/proc.h
server/engine/session/rateselinfo.cpp
server-restricted/datatype/switch/switchverifier.cpp
server-restricted/engine/bin/linux2.pcf
server-restricted/engine/bin/sunos5.pcf
server-restricted/engine/bin/unix.pcf
server-restricted/proxy/bin/linux2.pcf
server-restricted/proxy/bin/sunos5.pcf
server-restricted/proxy/bin/unix.pcf
server_rn/snmp/master/agent++/src/threads.cpp
Testing Performed
=================
Unit Tests:
- N/A
Integration Tests:
- 64-bit build starts and runs, and serves HTTP connections
- 32-bit build also streams via RTSP
Leak Tests:
- N/A
Performance Tests:
- N/A
Platforms Tested: sunos-5.10-sparc64-server (new), sunos-5.10-sparc32-server (new)
Build verified: linux-rhel5-i686
QA Hints
========
* N/A
Index: _main.cpp
===================================================================
RCS file: /cvsroot/server/engine/core/_main.cpp,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -d -r1.171 -r1.172
--- _main.cpp 6 Mar 2010 23:15:36 -0000 1.171
+++ _main.cpp 22 Apr 2010 15:07:42 -0000 1.172
@@ -1084,7 +1084,7 @@
// Did the stack come out aligned?
- pAlignedStackTop = (char*)(((unsigned)mmapPtr | (STACKSIZE-1)) +
+ pAlignedStackTop = (char*)(((PTR_INT)mmapPtr | (STACKSIZE-1)) +
1 - STACKSIZE);
if (pAlignedStackTop == mmapPtr)
@@ -1136,12 +1136,12 @@
if (*g_bMmapGrowsDown)
{
mapSize = STACKSIZE +
- ((int)mmapPtr - (int)pAlignedStackTop);
+ (mmapPtr - pAlignedStackTop);
}
else
{
mapSize = 2 * STACKSIZE -
- ((int)mmapPtr - (int)pAlignedStackTop);
+ (mmapPtr - pAlignedStackTop);
}
}
}
Index: bcastmgr.cpp
===================================================================
RCS file: /cvsroot/server/engine/core/bcastmgr.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- bcastmgr.cpp 6 Mar 2010 20:18:12 -0000 1.94
+++ bcastmgr.cpp 22 Apr 2010 15:07:44 -0000 1.95
@@ -1899,7 +1899,8 @@
m_aulLogicalStreamToSwitchGroup = new UINT32[m_ulStreamCount];
m_aulTmpSwitchGroupMap = new UINT32[m_ulStreamCount];
- for (UINT16 i = 0; i < m_ulStreamCount; i++)
+ UINT16 i = 0;
+ for (i = 0; i < m_ulStreamCount; i++)
{
m_pStreamHeaders[i] = 0;
m_pStreamDoneTable[i] = BCAST_STREAMDONE_TABLE_OK;
Index: malloc.cpp
===================================================================
RCS file: /cvsroot/server/engine/core/malloc.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- malloc.cpp 28 Jan 2010 21:40:00 -0000 1.29
+++ malloc.cpp 22 Apr 2010 15:07:44 -0000 1.30
@@ -79,7 +79,7 @@
_Page** g_pLastPage; // Mutex: FreeListLock
_FreePage** g_pFreePageListBySize; // Mutex: FreeListLock
-UINT32 SharedMemory::m_ulSingleMaxAllocation = SINGLE_MAX_MEMORY_ALLOCATION;
+UINT32 SharedMemory::m_ulSingleMaxAllocation = SINGLE_MAX_MEMORY_ALLOCATION*1024*1024;
extern void* g_pSecondHeapBottom;
#ifdef _LINUX
_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic