epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity
14,532 Commits 8 Branches 204 Tags
085fab4aedb6e6ff38220be2d7e822f0d2a30352
Commit Graph
592 Commits
Author SHA1 Message Date
Andrew Johnson 1293747cf3 Merge 3.14 branch into 3.15 2017-06-01 16:40:33 -05:00
Andrew Johnson 29c069db3d Testing msi: Add retries if necessary 
Hoping this will fix the annoying problems on Windows Jenkins.
 2017-05-31 12:51:39 -05:00
Michael Davidsaver a7c14ec995 Merge remote-tracking branch 'launchpad/3.14' 
* launchpad/3.14:
  ioc/rsrv: bounds check DBR
 2017-05-03 16:53:43 -04:00
Michael Davidsaver 875e4db3f9 Merge remote-tracking branch 'launchpad/3.14' 
* launchpad/3.14:
  missing include

Conflicts:
	src/ioc/dbStatic/dbStaticLib.c
 2017-05-02 18:38:40 -04:00
Michael Davidsaver 8c8604c503 Merge remote-tracking branch 'launchpad/3.14' 
* launchpad/3.14:
  ioc/dbStatic: dbFreeBase() don't double free alias'd records
  ioc/dbStatic: plug leak in dbFreeBase()
  ioc/dbStatic: whitespace
  Fix indentation warning from GCC
  libCom/test: errlog test more verbose
  libCom: STATIC_ASSERT use c++11 static_assert when possible
  Check for empty PV names in Perl catools

Conflicts:
	src/ioc/dbStatic/dbStaticLib.c
	src/libCom/osi/epicsAssert.h
 2017-05-02 18:31:40 -04:00
Andrew Johnson 35385bc688 Merge changes from 3.14 into 3.15 
Changes to be committed:
	modified:   src/ioc/db/dbCa.c
	modified:   src/libCom/calc/postfix.h
	modified:   src/libCom/test/epicsCalcTest.cpp
 2017-04-24 18:10:53 -05:00
Michael Davidsaver 22b10adf29 ioc/db: testdbGetFieldEqual() detect zero size 2017-04-21 16:14:43 -04:00
Andrew Johnson 6f9905d060 Fix dbUnitTest.c 2017-04-18 14:48:54 -05:00
Michael Davidsaver f3841c4767 avoid void* += 2017-04-17 18:58:19 -04:00
Michael Davidsaver b624222a0f db/test: dbPutGetTest check dbGet() of long string field 2017-04-06 20:28:04 -04:00
Michael Davidsaver 739a112bec db: dbGet() ensure long string nil and actual string length 2017-04-06 20:28:01 -04:00
Michael Davidsaver 5e082bb75d db/test: dbPutGetTest check for dbGet() attribute crash 2017-04-06 20:27:37 -04:00
Michael Davidsaver 8ebfd0821a db: fix dbGet() for attributes as long string 
dbGet() of "rec.RTYP$" with DBF_CHAR and nRequest==1
not handled correctly.  Results in crash.
 2017-04-06 20:27:34 -04:00
Michael Davidsaver fc8d4c2b5f db/test: dbPutGetTest add test for lp:1678494 2017-04-06 20:27:18 -04:00
Michael Davidsaver 1888253093 db: fix dbGet() of link fields as DBF_CHAR 
dbGet() DBF_CHAR with nRequest==1 not handled correctly.
Results in crash.
 2017-04-06 20:27:13 -04:00
Michael Davidsaver 8edefb9d63 dbUnitTest: add testdbGetArrFieldEqual() 2017-04-06 20:27:03 -04:00
Michael Davidsaver 0f31e35b87 db/test: add dbPutGetTest 2017-04-06 20:25:55 -04:00
Andrew Johnson d6b0c3041e Merged changes from 3.14 branch to revno 12703 2017-03-06 15:40:28 -06:00
Andrew Johnson 73eecbb759 Merged ARCH and bind fixes from 3.14 branch, revno 12696 2017-01-23 17:20:51 -06:00
Andrew Johnson dfc1b8ac23 Merged scan-rate protection changes from 3.14 branch, to revno 12693 2017-01-06 17:24:57 -06:00
Andrew Johnson 85b5551b3b Merged final changes from 3.14.12.6 release 2016-12-09 17:27:35 -06:00
Andrew Johnson 63b059c35e Resolve additional cppcheck issues; fix iOS build 2016-12-07 17:51:00 -06:00
Andrew Johnson dba6971e07 Merged changes from 3.14 branch to revno 12687 2016-12-07 16:36:58 -06:00
Andrew Johnson 726d7c6715 Fix chfPluginTest for MS 2015 compiler 2016-11-15 10:34:10 -06:00
Andrew Johnson b59a60e266 Merged the bigdb-3.15 branch with PHAS fix 2016-10-07 17:35:07 -05:00
Ralph Lange a32faa573c ioc/misc: add dbRecordsAbcSorted to dbCore.dbd 2016-10-07 11:56:06 +02:00
Ralph Lange de6a442048 dbStatic: fix compiler warnings (unused variables) 2016-10-07 10:29:28 +02:00
Ralph Lange 336bd656c8 dbStatic: only sort records alphabetically if explicitly configured (default: no sorting) 2016-10-06 15:36:44 +02:00
Ralph Lange 344928bdc6 dbStatic: remove dbRenameRecord() 2016-10-06 13:31:40 +02:00
Ralph Lange 843fb8ca95 dbStatic: update dbCreateAlias() to add to record list (instead of insertion sort) 2016-10-06 13:02:46 +02:00
Andrew Johnson 4686a062c8 Merged generalTime update from 3.14 branch, revno 12659 2016-09-02 12:47:23 -05:00
Andrew Johnson 25b3eae1c7 Merged changes from the 3.14 branch to revno 12658 2016-09-02 11:54:23 -05:00
Andrew Johnson b9f0ef5158 Merge 3.14 version and add 3.15 edits 2016-05-22 14:38:18 +02:00
Andrew Johnson 3c61880d79 Allow some callback slow-ups before failing tests 
The tests occasionally fail on Windows because the server
is busy; this will accept up to 4 slow callbacks without
them causing the build to fail.
 2016-05-16 16:55:50 -05:00
Andrew Johnson 8081d3ada4 Merged Till's fix for lp:1581212, modified 2016-05-13 14:48:08 -05:00
Andrew Johnson b87f3eaaee Merged changes from 3.14 branch to revno 12636 2016-05-13 13:12:08 -05:00
Andrew Johnson 3c8af4c571 Catch bad attribute names/values to prevent a segfault 2016-05-02 11:38:51 -05:00
Michael Davidsaver a3d981ad0a dbLink.c: fix dbGetLink for array of length 1 2016-05-01 13:30:45 -04:00
Andrew Johnson 496414c88c Fix for VxWorks 5.5 compiler 2016-04-28 23:28:39 -05:00
Andrew Johnson 5a605fa0c3 Set various EPICS_VERSION_* environment variables 
These are set at the same time as the ARCH variable.
Had to add EPICS_VERSION_SHORT and EPICS_VERSION_FULL to epicsVersion.h.

This uses more uniform names, should we change epicsVersion.h names?
We would continue to support the old names in parallel for some time.
 2016-04-28 18:58:07 -05:00
Andrew Johnson 0e5dc2a21c More build parameters. 
Renamed EPICS_TARGET_ARCH to EPICS_BUILD_TARGET_ARCH
Added EPICS_BUILD_OS_CLASS and EPICS_BUILD_COMPILER_CLASS
 2016-04-28 18:56:03 -05:00
Andrew Johnson 230603f4ac Remove ARCH from cdCommands and envPaths files 
Set it in iocshRegisterCommon() instead.
Remove ARCH from iocBoot/ioc/Makefile@Common templates.
 2016-04-28 18:50:41 -05:00
Andrew Johnson b4a8a1ac98 Fix dbFreeBase() issue causing segfaults 2016-04-28 18:10:26 -05:00
Ralph Lange 1f36670175 dbStatic: remove obsolete GUIGROUPS_GBLSOURCE definition 2016-04-27 09:14:51 +02:00
Michael DavidsaverandRalph Lange 77d6609bbd fixup comments 2016-04-26 20:19:19 -04:00
Andrew Johnson 1ede873200 Fixed some space/tab issues in DBD files 2016-04-26 16:20:12 -05:00
Michael DavidsaverandRalph Lange 70fc52bca0 dbCreateRecord use ellSortStable() 
sort records once per dbLoadCOM()
 2016-04-26 13:57:22 -04:00
Michael DavidsaverandRalph Lange 56d5a59356 dbScan: optimize addToList 
Insert from back to maintain ~same order.
Avoid iterating entire list each time
in the common case where all PHAS==0
 2016-04-26 13:56:57 -04:00
Michael DavidsaverandRalph Lange b392c1ca7d whitespace 2016-04-26 13:56:57 -04:00
Ralph Lange 6a362f467d rec: implement new promptgroup (gui_group) choices 2016-04-26 13:28:28 +02:00