lp:~ralph-lange/epics-base/ca-over-tcp

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~epics-core/epics-base/3.14 at revision 12092

Andrew Johnson: Approve on 2010-08-10

Jeff Hill: Approve on 2010-05-14

Diff: 3727 lines (+1333/-650)

23 files modified

src/ca/CASG.cpp (+8/-12)
src/ca/CAref.html (+168/-155)
src/ca/SearchDest.h (+39/-0)
src/ca/caProto.h (+4/-1)
src/ca/ca_client_context.cpp (+8/-7)
src/ca/cac.cpp (+126/-60)
src/ca/cac.h (+34/-18)
src/ca/iocinf.cpp (+8/-7)
src/ca/nciu.h (+1/-1)
src/ca/tcpiiu.cpp (+128/-40)
src/ca/udpiiu.cpp (+213/-85)
src/ca/udpiiu.h (+37/-10)
src/ca/virtualCircuit.h (+48/-13)
src/cas/generic/caHdrLargeArray.h (+1/-1)
src/cas/generic/casStrmClient.cc (+256/-41)
src/cas/generic/casStrmClient.h (+77/-71)
src/cas/io/bsdSocket/casIntfIO.cc (+33/-34)
src/cas/io/bsdSocket/casStreamIO.cc (+20/-25)
src/cas/io/bsdSocket/casStreamIO.h (+24/-32)
src/libCom/env/envDefs.h (+1/-0)
src/rsrv/camessage.c (+74/-15)
src/rsrv/caservertask.c (+14/-10)
src/rsrv/server.h (+11/-12)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

12053. By Ralph Lange <rlange@nsls2rlange> on 2010-05-14

Removed comment about ellfree @Windows in udpiiu.cpp (suggested by Jeff).

12052. By Ralph Lange <rlange@nsls2rlange> on 2010-04-15

Fixed issue "TCP Nameserver Connection Down Blocks All Callbacks" and cleaned up the SearchDest list / TCP circuit relation
* Pulled out tcpiiu::SearchDestTCP to have cac create the SearchDest independent from the TCP circuit
* Reorganized the relation between the SearchDestTCP and the TCP circuit:
  - SearchDest stays always on the cac list
  - TCP connection going down sets SearchDest inactive and SearchDestTCP's circuit member to NULL
  - Next seach request creates the new TCP circuit and sets SearchDestTCP's member, but leaves SearchDest inactive
  - Successful connect sets SearchDest active
* ReceiveThread releases the cac mutex before going to sleep in connect loop

12051. By Ralph Lange on 2010-04-09

Make SearchDest.h include all the headers it needs

12050. By Ralph Lange on 2010-04-09

Fix for: TCP Nameserver Connections Do Not Reconnect

12049. By Ralph Lange on 2010-04-07

Added EPICS_CA_NAME_SERVERS paragraph. Fixed lots of minor issues (unprintable characters).

12048. By Ralph Lange on 2010-04-06

Merged Codeathon 2008 changes (10292..10293 on cvs-trunk branch).
 * Fixed conflicts until base compiles
 * COMPLETELY UNTESTED

12047. By Ralph Lange on 2010-04-02

Merged Ralph Lange's 'compress-fix' branch.

12046. By Andrew Johnson on 2010-04-02

Merged Michael Davidsaver's 'minor-fixes' branch.

12045. By Andrew Johnson on 2010-03-24

The monitor last value field needs to be initialized.

Device support init_record is allowed to set VAL to 1.
If uninitialized then mlst is 0.
During the first process() this will miss a monitor if VAL is changed to 0,
and cause a spurious monitor if VAL remains 1.

- mdavidsaver

12044. By Andrew Johnson on 2010-03-09

Improve code readablity, add more numeric tests.