lp:~epics-core/epics-base/3.15_libcom_from_cvs_trunk

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~epics-core/epics-base/3.15 at revision 12518

mdavidsaver: Approve (read code and ran tests) on 2014-08-22

Diff: 1110 lines (+391/-281) (has conflicts)

14 files modified

src/ca/legacy/pcas/generic/casPVI.cc (+3/-2)
src/libCom/bucketLib/bucketLib.c (+2/-2)
src/libCom/cxxTemplates/README (+1/-23)
src/libCom/fdmgr/fdManager.cpp (+5/-8)
src/libCom/fdmgr/fdManager.h (+2/-2)
src/libCom/misc/aToIPAddr.c (+151/-46)
src/libCom/misc/ipAddrToAsciiAsynchronous.cpp (+2/-2)
src/libCom/osi/epicsTime.cpp (+53/-53)
src/libCom/osi/os/WIN32/osdProcess.c (+63/-77)
src/libCom/osi/os/WIN32/osdTime.cpp (+80/-40)
src/libCom/osi/os/vxWorks/osdSock.c (+3/-10)
src/libCom/osi/osiNTPTime.c (+1/-0)
src/libCom/test/blockingSockTest.cpp (+25/-11)
src/libCom/test/epicsTimeTest.cpp (+0/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

12457. By Andrew Johnson on 2014-08-19

Reverted changes to epicsTime.h and epicsThread.h

12456. By Andrew Johnson on 2014-08-02

blockingSockTest: Undo member renames using m_ prefix

Using the m_ prefix to denote class data members is dangerous in
code that has to compile on VxWorks 5.5 (which 3.15 does) because
the net/mbuf.h header contains the following macro definitions:

#define m_next mBlkHdr.mNext
#define m_len mBlkHdr.mLen
#define m_data mBlkHdr.mData
#define m_type mBlkHdr.mType
#define m_flags mBlkHdr.mFlags
#define m_nextpkt mBlkHdr.mNextPkt
#define m_act m_nextpkt
#define m_pkthdr mBlkPktHdr
#define m_ext pClBlk
#define m_extBuf m_ext->clNode.pClBuf
#define m_extFreeRtn m_ext->pClFreeRtn
#define m_extSize m_ext->clSize
#define m_extRefCnt m_ext->clRefCnt
#define m_extArg1 m_ext->clFreeArg1
#define m_extArg2 m_ext->clFreeArg2
#define m_extArg3 m_ext->clFreeArg3
#define m_copy(m, o, l) m_copym((m), (o), (l), M_DONTWAIT)
#define m_copym(m, o, l, w) netMblkChainDup(_pNetDpool, (m), (o), (l), (w))
#define m_freem(m) netMblkClChainFree(m)
#define m_free(m) netMblkClFree(m)
#define m_mbufs mNum
#define m_drops mDrops
#define m_wait mWait
#define m_drain mDrain
#define m_mtypes mTypes

While the names in the original change all appear to be safe, I
don't want us to start using this convention because we will then
have to police commits more closely or risk build failures in the
future when someone who doesn't know about or remember the issue
can't or doesn't try building their code against VxWorks 5.5.

I don't particularly like the this-> convention to mark member
names either, but until the VxWorks 5.5 support requirement goes
away the m_ convention is worse. Another common convention of
using a leading underscore is not safe either, those names are
reserved for the C/C++ implementation.

12455. By Andrew Johnson on 2014-08-02

Fix typo in macro name

Not that it really matters since only VxWorks and RTEMS actually
compile this file and they don't have shared libraries...

12454. By Andrew Johnson on 2014-08-02

Use epicsUInt types, stdint.h is not found on all platforms

12453. By Jeff Hill on 2013-11-08

fixed ms compiler build

12452. By Jeff Hill on 2013-11-07

oops, variable used to be unsigned; changed to signed constant

12451. By Jeff Hill on 2013-11-07

o fixed compile errors in, and proper diagnostic from, casPVI.cc
o suprressed some compile time warnings in bucketLib.c
o cleaned up cxx templates README
o removed use of tsMinMax from libCom in favor of the standard library
     (calls to tsMinMax still exist in other components in base, but they are being removed)
o removed sharable library export of certain private member functions from class fdManager
o fixed aToIPAddr to correctly lookup all of the different IP addresses string types on all OS types
    independent of the OS interfae variations
o removed use of inet_aton from vxWorks implementation of hostToIPAddr
   o this function is for converting a host name to an ip address _only_
   o the aToIPAddr wrapper is supposed to do the dotted ip ascii string to ip address structure
   conversion independent of OS spoecific interface variations, when it works correctly
o fixed some spelling issues in comments
o added additional optimizations for processors w/o floating point ALU to addNanoSec in epicsTime
o removed tabs and junk comments from win32 osdProcess.c
o moved PLL update in win32 osdTime.c from timer to a dedicated thread
o added missing epicsExportShared symbols define to osiNTPTime.c
o fixed server ctor should not modify arguments of its caller in blockingSockTest
o removed sunpro specific ifdef nolomger needed from epicsTimeTest.cpp

12450. By Janet B. Anderson on 2013-10-15

Fixed comments

12449. By Janet B. Anderson on 2013-10-15

Modified suffix for TESTSHRLIBNAME

12448. By Andrew Johnson on 2013-10-14

softIoc: Generate base.dbd

Includes new dependency rules for parallel builds.