Commit Graph

13193 Commits

Author SHA1 Message Date
Andrew Johnson 9079c8aa53 Reverted changes to epicsTime.h and epicsThread.h 2014-08-18 22:55:07 -05:00
Andrew Johnson b7f8f17227 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.
2014-08-02 14:02:43 -05:00
Andrew Johnson 8d5cdc3747 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...
2014-08-02 13:13:49 -05:00
Andrew Johnson f1a59aa64a Use epicsUInt types, stdint.h is not found on all platforms 2014-08-02 13:09:07 -05:00
Jeff Hill 6f67091628 fixed ms compiler build 2013-11-07 17:37:17 -07:00
Jeff Hill 36d801682b oops, variable used to be unsigned; changed to signed constant 2013-11-07 14:59:30 -07:00
Jeff Hill 4d54b91a3a 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
2013-11-07 10:26:03 -07:00
Janet Anderson 16c252d8aa Fixed comments 2013-10-15 11:32:31 -05:00
Janet Anderson ed5adebd47 Modified suffix for TESTSHRLIBNAME 2013-10-15 09:10:16 -05:00
Andrew Johnson da80d11db9 softIoc: Generate base.dbd
Includes new dependency rules for parallel builds.
2013-10-14 12:45:08 -05:00
Andrew Johnson 91ef05b5dc tools: Improve dbdExpand.pl error/warning message
Missing files used to result in an empty output file.
Now it warns instead of dying, and suggests adding a
dependency to the Makefile.
2013-10-14 12:43:26 -05:00
Andrew Johnson 34267b31b7 softIoc: Parallel build dependency 2013-10-11 15:15:17 -07:00
Andrew Johnson be516ddac0 std/rec: Fix clang compiler warning. 2013-10-11 14:00:36 -07:00
Andrew Johnson 1b51a4796d Merged printf-record branch
Adds three new record types: printf, lsi and lso.
Provides device support for all three.
2013-10-03 14:04:03 -07:00
Andrew Johnson 72d65c60a4 epicsErrlogTest: Shorten output lines
Shorten test output from long messages.
2013-09-20 13:44:28 -05:00
Andrew Johnson b58380fc69 configure: Add vpath for .hpp files
Even Linux systems are using this for C++ headers now,
they're not just for Windows.
2013-09-19 13:02:36 -05:00
Andrew Johnson ec0f64140a configure: IOS version bump to 6.1 2013-08-30 12:52:10 -05:00
Andrew Johnson c61d0b43bb configure: Fix ios HDEPENDS_METHOD
It changed on 3.14, but 3.15 needs a different seting.
2013-08-30 12:34:15 -05:00
Janet Anderson 859024d155 Stopped install of test libraries and removed version number in test library name. 2013-07-26 14:37:55 -05:00
Janet Anderson a9a3298d51 Added OPT_CXXFLAGS_YES += -g 2013-07-25 10:44:41 -05:00
Andrew Johnson 8a28858ada Merged changes from 3.14 branch. 2013-07-10 16:18:18 -05:00
Andrew Johnson f2891d72e5 ca: Add missing template instances for VxWorks 5.5.x 2013-07-10 14:55:34 -05:00
Andrew Johnson 75a5f19d2e IOCS_APPL_TOP must be absolute path
Fix a recently introduced problem where cdCommands and envParams
had TOP as a relative path (which actually worked by chance).
Also fixed a problem with convertRelease hanging when the -t
argument matched the absolute path to TOP.
2013-07-10 14:13:31 -05:00
Andrew Johnson 98deef5004 configure: Added FULLPATHNAME tool variable
Changed os/CONFIG files where we use the fullPathName.pl script.
2013-07-10 14:07:51 -05:00
Janet Anderson cec9bd3aa9 Remove .. from vpath. Add rules with .. prerequisite. 2013-07-08 15:17:46 -05:00
Andrew Johnson c187d8c13a CAref: typo's, added missing ca_put_callback 2013-07-05 13:26:26 -05:00
Andrew Johnson c96db4c877 libCom: Replaced errlogRemoveListener()
New version errlogRemoveListeners() is safer.
2013-06-28 12:35:43 -05:00
Andrew Johnson 1289f99e30 rec: Additional dependencies for parallel builds. 2013-06-21 10:36:26 -05:00
Andrew Johnson ec9568d096 std: Don't try and use removed RULES file... 2013-06-18 11:39:19 -05:00
Andrew Johnson a9be8957bc rec: Remove now unnecessary RULES file 2013-06-18 11:19:34 -05:00
Andrew Johnson 4564346722 Release notes for previous commit. 2013-06-18 10:03:37 -05:00
Andrew Johnson 9d9f345278 configure: Removed generation of xxxInclude.dbd files
Rules now expand the source DBD files directly in to the target.
Also removed the makeIncludeDbd.pl script which is no longer needed.
2013-06-18 10:01:37 -05:00
Andrew Johnson c4d6e2a61e dbStatic: Improve dbDumpDevice
Make it also display the function pointers in the dset and dsxt
for each device support it reports on.
2013-06-14 13:55:22 -05:00
Andrew Johnson 2be5e15346 Merged changes from 3.14 branch
Up to revno 12420 inclusive.
2013-06-07 18:08:38 -05:00
Andrew Johnson ef5d88d3e5 libCom: Back-ported aToIPAddr fix from 3.15 branch.
Cherry-picked 3.15 revno 12398 with some changes.
2013-06-07 17:03:55 -05:00
Andrew Johnson 93449dccb8 ca: Fix acctst.c for older C compilers
All declarations must still precede other statements within a block...
2013-06-07 16:08:57 -05:00
Andrew Johnson 863e8fdd3b libCom: Fix VxWorks localtime_r() and gmtime_r() wrappers
Wind River changed the return value between VxWorks 6.8 and 6.9.
2013-06-07 14:35:45 -05:00
Andrew Johnson 2eb48f43eb Merged my udf-severity branch. 2013-05-30 15:00:37 -05:00
Andrew Johnson d36f6aa84f ca: Fix acctst.c for older C compilers
All declarations must still precede other statements within a block...
2013-05-30 12:25:37 -05:00
Andrew Johnson ee9c0ba409 ca: Minor reference manual tweaks. 2013-05-28 15:07:33 -05:00
Andrew Johnson 7f82c2f32e libCom: Added osi/os/WIN32/osdFindSymbol.c
Implemented by Dirk Zimoch.
2013-05-28 14:16:22 -05:00
Andrew Johnson 7addfc8ddd libCom/test: Make epicsUnitTestTest.plt more Perlish
Use Perl's __DATA__ stream for the expected data string.
2013-05-24 15:33:56 -05:00
Jeff Hill johill@lanl.gov e0bc071de3 merged in fix for https://bugs.launchpad.net/epics-base/+bug/1179642
also merged in removal of c++ support for old HPUX compiler
2013-05-16 12:33:31 -06:00
Jeff Hill johill@lanl.gov 5e5ea11658 fix for https://bugs.launchpad.net/epics-base/+bug/1179642 2013-05-16 11:17:47 -06:00
Jeff Hill johill@lanl.gov de2495d276 fixed test name in output 2013-05-15 14:18:11 -06:00
Jeff Hill johill@lanl.gov fedaf622ac improved multiSubscrDestroyNoLateCallbackTest quality by temporarily raing the priority of the main thread in the ca context 2013-05-15 12:05:58 -06:00
Jeff Hill johill@lanl.gov 711e82b1a6 fixed the test name of multiSubscrDestroyNoLateCallbackTest 2013-05-15 10:37:17 -06:00
Jeff Hill johill@lanl.gov deb1fe8c7c removed deadlock potential from test code 2013-05-15 10:24:18 -06:00
Jeff Hill johill@lanl.gov 8db3d7391b improved the quality of the multiSubscrDestroyLateNoCallbackTest 2013-05-15 09:51:48 -06:00
Jeff Hill johill@lanl.gov 4780fb2fe5 fixed credit line comment 2013-05-14 17:15:30 -06:00