epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity
16,347 Commits 8 Branches 203 Tags
88cdffddb6f41e8f4cffec86cac260eceab7db5b
Commit Graph

59 Commits

Author SHA1 Message Date
Dirk Zimoch
88cdffddb6 Merge branch '7.0' release 7.4.0.1 into PSI-7.0 
Conflicts:
	.gitmodules
	modules/database/src/ioc/db/Makefile
	modules/libcom/test/epicsAtomicTest.cpp
	modules/pvAccess
	modules/pvData
	modules/pvDatabase
	modules/pva2pva
 2020-06-03 10:46:07 +02:00
Andrew Johnson
808cf80579 Fix Makefiles to use RULES_DIRS instead of _TOP 2020-05-26 22:09:24 -05:00
Dirk Zimoch
36a8b51d8e CleanupWhitespace 
removed spaces at end of line

replaced tabs with spaces
 2020-05-20 14:48:09 -07:00
Michael Davidsaver
a9934792a0 Merge remote-tracking branch 'lp-anj7/expanded-rules' into 7.0 
* lp-anj7/expanded-rules:
  Generate module version files with new RULES_EXPAND facilities
  Extend RULES_EXPAND to add more features
  More generator doc updates
  Document <library>_API = <stem> for Makefiles
  Convert epicsShareAPI to epicsStdCall in modules/ca
  Update generator script
  Modify rules to allow multiple API.h libraries to be built
  Convert modules/ca to use LIBCA_API instead of epicsShare
  Try out a representative sample of APIs from multiple libraries
  Add build rules to generate and install *API.h header files
  Add script to generate *API.h headers
 2020-04-30 11:34:34 -07:00
Michael Davidsaver
f1cbe93b6c Revert "replace most internal getCurrent() -> getMonotonic()" 
This reverts commit 4f2228fb1d
except for some test code.
 2020-04-24 15:37:48 -07:00
Andrew Johnson
85d1982890 Merge changes from 3.15 branch into 7.0 2020-04-15 21:39:54 -05:00
Andrew Johnson
5009f288ae Generate module version files with new RULES_EXPAND facilities 
Also removes the separate *VersionNum.h@ templates
 2020-03-20 12:03:14 -05:00
Andrew Johnson
33c3b1c89a Convert epicsShareAPI to epicsStdCall in modules/ca 2020-03-10 23:42:42 -05:00
Andrew Johnson
18402f0354 Convert modules/ca to use LIBCA_API instead of epicsShare 
Also unified the header exclusion guard names,
removed a couple of files that are no longer used,
dropped the '3.13.7' from the Copyright header.
 2020-03-09 23:53:22 -05:00
Andrew Johnson
0cf38bfb29 Try out a representative sample of APIs from multiple libraries 2020-03-07 01:32:36 -06:00
hanlet
97bf9171c6 Added Multicast to caRepeater 
Modifications to allow for CA multicast listening by adding multicast address
from EPICS_CA_BEACON_ADDR_LIST (or EPICS_CA_ADDR_LIST if beacon list is empty).
Original modifications from Jim Smedinghoff, with further changes by Pierrick Hanlet.
 2020-02-14 11:42:17 +00:00
Michael Davidsaver
6dba2ec1d7 caRepeater /dev/null 2020-02-14 09:00:22 +00:00
Karl Vestin
2bcaa5448c Added null check in modules/ca/src/client/udpiiu.cpp to prevent possible dereferencing of null pointer. Flagged as error by Codacy static code analysis. 
Codacy link: https://app.codacy.com/gh/epics-base/epics-base/file/42103575495/issues/source?bid=16430872&fileBranchId=16430872#l950
Launchpad bug: https://bugs.launchpad.net/epics-base/+bug/1862916

LP: #1862916
 2020-02-13 13:22:04 +00:00
Michael Davidsaver
7b6e48f4e0 casw shouldn't use monotonic 2020-02-12 11:16:29 +00:00
Dirk Zimoch
86adc529ef Merge remote-tracking branch 'origin' into PSI-7.0 
Conflicts:
	configure/os/CONFIG_SITE.Common.linuxCommon
	modules/libcom/src/log/iocLog.c
	modules/libcom/src/log/logClient.c
	modules/pvAccess
	modules/pvData
	modules/pvDatabase
 2020-02-06 17:28:40 +01:00
Michael Davidsaver
3c0d4ccf49 remove another __DATE__ 2019-11-16 10:26:23 -08:00
Michael Davidsaver
905ca4b7ac quiet some warnings 2019-11-13 10:17:43 -08:00
Andrew Johnson
171b3301a7 Fix ..// => ../ in Makefile-relative source paths 2019-10-28 15:00:15 -05:00
Andrew Johnson
3e7e26d8d7 Merge 3.15 branch into 7.0 2019-10-28 01:03:12 -05:00
Michael Davidsaver
e257e30cc9 Merge remote-tracking branch 'lp-Com/use-monotonic' into 7.0 
* lp-Com/use-monotonic:
  VxWorks: Measure CPU time-base frequency if necessary
  replace most internal getCurrent() -> getMonotonic()
  dbScan periodic scan use monotonic time
  monotonic adapt to regular time APIs
 2019-10-06 20:10:20 -07:00
Michael Davidsaver
966965c2c1 Merge remote-tracking branch 'lp-Com/make-simple' into 7.0 
* main/make-simple:
  restore ModuleDirs in caPerlApp
  simplify e_flex/antelope path compute
  further no need to search for perl modules under bin
  skip RELEASE_TOPS
  configure: Don't hide any perl scripts being run
  missed a TOP
  no need to search for perl modules under bin/
  drop unnecessary *ModuleDirs
  avoided embedded TOP for non sub-modules
 2019-09-17 14:57:47 -07:00
Andrew Johnson
fd48ee9aec Update submodules 
Adjust comments in the embedded module CONFIG_*_VERSION files
 2019-08-13 11:21:26 -05:00
Dirk Zimoch
53dd61b80a merged with R7.0.3 2019-08-09 11:31:43 +02:00
Andrew Johnson
29fc49199d Update versions after tag, set DEVELOPMENT_FLAG/DEV_SNAPSHOT 2019-07-31 14:29:18 -05:00
Andrew Johnson
841ef37820 Update version numbers for Base and internal modules 
Clear EPICS_DEV_SNAPSHOT flag for tagging.
 2019-07-31 12:11:22 -05:00
Andrew Johnson
59cffd51ae Merge 3.15 branch into 7.0 2019-07-25 18:10:40 -05:00
Dirk Zimoch
2b157096e6 merge branch '7.0' into 'PSI-7.0' 2019-07-22 15:44:08 +02:00
Michael Davidsaver
1a94376c19 restore ModuleDirs in caPerlApp 2019-07-09 18:42:19 -07:00
Michael Davidsaver
5b09bb6e71 Set file+line for epicsMutex 
Makes the output of epicsMutexShowAll more useful wrt. libca.
 2019-06-26 09:40:41 -07:00
Michael Davidsaver
72985505ef further no need to search for perl modules under bin 2019-06-04 11:24:35 +02:00
Ralph Lange
8c993405b4 doc/ca: clarify variable size array subscription 
(cherry-picked from branch 3.15)
 2019-05-09 17:32:05 +02:00
Andrew Johnson
44510f2fb2 Merge 3.15 branch into 7.0 2019-03-07 12:56:57 -06:00
Dirk Zimoch
7889dda6f8 merged with upstream 2019-02-20 10:51:02 +01:00
Michael Davidsaver
d38fcd5247 no need to search for perl modules under bin/ 2019-01-03 20:18:16 -08:00
Michael Davidsaver
d7841f407a drop unnecessary *ModuleDirs 2019-01-03 20:18:11 -08:00
Michael Davidsaver
49b323b93c avoided embedded TOP for non sub-modules 2019-01-03 20:17:58 -08:00
Michael Davidsaver
4f2228fb1d replace most internal getCurrent() -> getMonotonic() 
every place where a time delta is computed, and then some.
 2019-01-03 19:34:47 -08:00
Andrew Johnson
8b31fba8cb Update version numbers of embedded modules 2018-12-17 17:20:01 -06:00
Andrew Johnson
8481ae3787 Set embedded modules' SHRLIB_VERSION from CONFIG variables 2018-12-17 17:19:10 -06:00
Andrew Johnson
6d5f57daf1 Merge 3.16 branch into 7.0 2018-12-12 15:17:02 -06:00
Michael Davidsaver
cae597d21c ca: suppress repeated UDP error messages 2018-11-14 09:43:14 -08:00
Andrew Johnson
2efe56c6d1 Merge 3.16 (after 3.16.2-rc1) into 7.0 2018-10-26 17:04:53 -05:00
Dirk Zimoch
7738b68320 fix missing template instances for old vxWorks (uses -fno-implicit-templates) 2018-09-24 18:00:53 +02:00
Andrew Johnson
7e598c60cc Merge changes from 3.16 branch into 7.0 2018-06-20 23:27:49 -05:00
Ralph Lange
cdd8f610ec Merge branch 'ca/master' back 2018-06-20 08:57:14 +02:00
Ralph Lange
893fbae559 Remove EPICS Base submodules 2018-06-19 11:49:10 +02:00
Ralph Lange
e165567234 Move all under modules/ca 2018-06-19 11:33:25 +02:00
Andrew Johnson
5fb3ee27ba Update modules merged with 3.16 2018-03-22 23:30:58 -05:00
Andrew Johnson
ca9e57cc3a Merge 3.16 into core/master and other modules 2018-02-25 00:39:49 -06:00
Andrew Johnson
d550b9d55c Merge 3.16 into core/master and related master branches 2018-02-05 13:59:12 -06:00