Update version number to 3.14.12.8-rc1

Documentation updates for 3.14.12.8
dbCa: Fix for lp: #541221
2018-07-19 12:31:52 -05:00 · 2018-07-19 12:20:41 -05:00 · 2018-07-13 13:05:54 -05:00 · 2018-06-07 11:32:16 +02:00 · 2018-06-07 11:21:04 +02:00 · 2018-06-07 11:07:29 +02:00
13 changed files with 228 additions and 118 deletions
--- a/configure/CONFIG_BASE_VERSION
+++ b/configure/CONFIG_BASE_VERSION
@@ -28,15 +28,10 @@ EPICS_MODIFICATION = 12

 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
 # Not included if zero
-EPICS_PATCH_LEVEL = 7
+EPICS_PATCH_LEVEL = 8

 # This will end in -DEV between official releases
-EPICS_DEV_SNAPSHOT=-DEV
-#EPICS_DEV_SNAPSHOT=-pre1
-#EPICS_DEV_SNAPSHOT=-pre1-DEV
-#EPICS_DEV_SNAPSHOT=-pre2
-#EPICS_DEV_SNAPSHOT=-pre2-DEV
-#EPICS_DEV_SNAPSHOT=-rc1
+EPICS_DEV_SNAPSHOT=-rc1
 #EPICS_DEV_SNAPSHOT=-rc1-DEV
 #EPICS_DEV_SNAPSHOT=-rc2
 #EPICS_DEV_SNAPSHOT=-rc2-DEV
--- a/documentation/KnownProblems.html
+++ b/documentation/KnownProblems.html
@@ -4,27 +4,16 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <title>Known Problems in R3.14.12.1</title>
+  <title>Known Problems in R3.14.12.8</title>
 </head>

 <body>
-<h1 style="text-align: center">EPICS Base R3.14.12.1: Known Problems</h1>
+<h1 style="text-align: center">EPICS Base R3.14.12.8: Known Problems</h1>

-<p>Any patch files linked below should be applied at the root of the
-base-3.14.12.1 tree. Download them, then use the GNU Patch program as
-follows:</p>
-
-<blockquote><pre>% <b>cd <i>/path/to/</i>base-3.14.12.1</b>
-% <b>patch -p0 &lt; <i>/path/to/</i>file.patch</b></pre></blockquote>
-
-<p>The following significant problems have been reported with this
-version of EPICS Base:</p>
-
-<ul>
-
-  <li>None yet.</li>
-
-</ul>
+<p>This was the last release in the Base-3.14 series, so we are no longer
+tracking bugs in this branch. Please upgrade to one of the newer releases which
+have incorporated many bug fixes and new features since they branched off the
+Base-3.14 release series.</p>

 </body>
 </html>
--- a/documentation/RELEASE_NOTES.html
+++ b/documentation/RELEASE_NOTES.html
@@ -3,16 +3,65 @@
 <html>
 <head>
  <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
-  <title>EPICS Base R3.14.12.7 Release Notes</title>
+  <title>EPICS Base R3.14.12.8 Release Notes</title>
 </head>

 <body lang="en">
-<h1 align="center">EPICS Base Release 3.14.12.7</h1>
+<h1 align="center">EPICS Base Release 3.14.12.8</h1>

-<h2 align="center">Changes between 3.14.12.6 and 3.14.12.7</h2>
+<p>This is the final release in the Base-3.14 series, please upgrade to the
+Base-3.15 series or to EPICS 7.</p>
+
+<h2 align="center">Changes between 3.14.12.7 and 3.14.12.8</h2>

 <!-- Insert new items immediately below here ... -->

+<h3>Fixes for Launchpad bugs</h3>
+
+<p>The following launchpad bugs have fixes included:</p>
+
+<ul>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/541221">
+    lp: #541221</a>, 'assert (pca->pgetNative)' failed in ../dbCa.c</li>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/1747091">
+    lp: #1747091</a>, epicsTimeGetEvent() / generalTime bug</li>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/1743076">
+    lp: #1743076</a>, Segfault in ca_attach_context() during exits</li>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/1751380">
+    lp: #1751380</a>, Deadlock in ca_clear_subscription()</li>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/1597809">
+    lp: #1597809</a>, Setting NAME field in DB file may break IOC</li>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/1770292">
+    lp: #1770292</a>, get_alarm_double() inconsistent across record types</li>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/1771298">
+    lp: #1771298</a>, Conversion of NaN to integer relies on undefined
+    behavior</li>
+</ul>
+
+<h3>Updated VxWorks Timezone settings</h3>
+
+<p>Removed the settings for 2017; fixed the hour of the change for MET.</p>
+
+<h3>Back-port podToHtml.pl and Rules from Base-3.15</h3>
+
+<p>This script permits Base to be built with Perl installations that do not
+provide the podchecker and pod2html scripts (e.g. Fedora 27).</p>
+
+<h3>Fixed camonitor server side relative timestamps bug</h3>
+
+<p>Initialize the first time-stamp from the first monitor, not the client-side
+current time in this configuration.</p>
+
+<h3>Build changes for MSVC</h3>
+
+<p>Windows builds using Visual Studio 2015 and later now use the <tt>-FS</tt>
+compiler option to allow parallel builds to work properly.</p>
+
+<p>We now give the <tt>-FC</tt> option to tell the compiler to print absolute
+paths for source files in diagnostic messages.</p>
+
+<h2 align="center">Changes between 3.14.12.6 and 3.14.12.7</h2>
+
 <h3>Extend maximum Posix epicsEventWaitWithTimeout() delay</h3>

 <p>The Posix implementation of epicsEventWaitWithTimeout() was limiting the
--- a/src/ca/CAref.html
+++ b/src/ca/CAref.html
@@ -1009,7 +1009,7 @@ d:/user/R3.14.clean/epics/base/lib/WIN32-x86/</code></p>
 <h2><a name="CommandUtils">Command Line Utilities</a></h2>

 <h3><a name="acctst">acctst</a></h3>
-<pre>acctst &lt;PV name&gt; [progress logging level] [channel duplication count] 
+<pre>acctst &lt;PV name&gt; [progress logging level] [channel duplication count]
                 [test repetition count] [enable preemptive callback]</pre>

 <h4>Description</h4>
@@ -2079,7 +2079,7 @@ example, be beneficial when tuning an archiver installation.</p>
 <p>Significant performance gains can be realized when the CA client library
 doesn't wait for a response to return from the server after each request. All
 requests which require interaction with a CA server are accumulated (buffered)
-and not forwarded to the IOC until one of <code>ca_flush_io()</code>, 
+and not forwarded to the IOC until one of <code>ca_flush_io()</code>,
 <code>ca_pend_io()</code>, <code>ca_pend_event()</code>, or
 <code>ca_sg_block()</code> are called allowing several operations to be
 efficiently sent over the network together. Any process variable values written
@@ -2103,16 +2103,16 @@ shouldn't test the success of a CA function call by checking to see if the
 returned value is zero as is the UNIX convention. Below are several methods to
 test CA function returns. See <a href="#ca_signal"><code>ca_signal()</code> and
 <code>SEVCHK()</code></a> for more information on this topic.</p>
-<pre>status = ca_XXXX(); 
-SEVCHK( status, "ca_XXXX() returned failure status"); 
+<pre>status = ca_XXXX();
+SEVCHK( status, "ca_XXXX() returned failure status");

-if ( status &amp; CA_M_SUCCESS ) { 
-        printf ( "The requested ca_XXXX() operation didn't complete successfully"); 
-} 
+if ( status &amp; CA_M_SUCCESS ) {
+        printf ( "The requested ca_XXXX() operation didn't complete successfully");
+}

-if ( status != ECA_NORMAL ) { 
+if ( status != ECA_NORMAL ) {
        printf("The requested ca_XXXX() operation didn't complete successfully because \"%s\"\n",
-                ca_message ( status ) ); 
+                ca_message ( status ) );
 }</pre>

 <h3><a name="Channel">Channel Access Data Types</a></h3>
@@ -2285,7 +2285,7 @@ int main ( int argc, char ** argv )
    unsigned nBytes;
    unsigned elementCount;
    char timeString[32];
-    unsigned i;    
+    unsigned i;
    chid chan;
    double sum;
    int status;
@@ -2328,7 +2328,7 @@ int main ( int argc, char ** argv )
    epicsTimeToStrftime ( timeString, sizeof ( timeString ),
        "%a %b %d %Y %H:%M:%S.%f", &amp; pTD-&gt;stamp );

-    printf ( "The sum of elements in %s at %s was %f\n", 
+    printf ( "The sum of elements in %s at %s was %f\n",
        argv[1], timeString, sum );

    ca_clear_channel ( chan );
@@ -2359,7 +2359,7 @@ executing within the user's callback function.</p>
 <pre>typedef struct event_handler_args {
    void            *usr;   /* user argument supplied with request */
    chanId          chid;   /* channel id */
-    long            type;   /* the type of the item returned */ 
+    long            type;   /* the type of the item returned */
    long            count;  /* the element count of the item returned */
    const void      *dbr;   /* a pointer to the item returned */
    int             status; /* ECA_XXX status of the requested op from the server */
@@ -2382,7 +2382,7 @@ attached to the request, an exception handler is executed in the client. The
 default exception handler prints a message on the console and exits if the
 exception condition is severe. Certain internal exceptions within the CA client
 library, and failures detected by the SEVCHK macro may also cause the exception
-handler to be invoked. To modify this behavior see 
+handler to be invoked. To modify this behavior see
 <code><a href="#ca_add_exception_event">ca_add_exception_event</a>()</code>.</p>

 <h3><a name="Server">Server and Client Share the Same Address Space on The Same
@@ -2674,6 +2674,14 @@ automatically released by the system when the process exits and
 vxWorks or RTEMS no cleanup occurs unless the application calls
 <code>ca_context_destroy()</code>.</p>

+<p>Note: This operation blocks until any user callbacks for any channel
+created in the current context have run to completion. If callbacks take a
+lock (mutex) then it is the user's responsibility to ensure that this lock
+is not held when <code>ca_clear_context()</code> is called, otherwise a
+deadlock may ensue. (See also
+<code><a href="#ca_clear_channel">ca_clear_channel</a>()</code> and
+<code><a href="#ca_clear_event">ca_clear_subscription</a>()</code>.)</p>
+
 <h4>Returns</h4>

 <p>ECA_NORMAL - Normal successful completion</p>
@@ -2819,6 +2827,12 @@ efficiently sent over the network in one message.</p>
 clearing a channel does shutdown and reclaim any channel state change event
 subscriptions (monitors) registered with the channel.</p>

+<p>Note: This operation blocks until any user callbacks for this channel
+have run to completion. If callbacks take a lock (mutex) then it is the
+user's responsibility to ensure that this lock is not held when
+<code>ca_clear_channel()</code> is called, otherwise a deadlock may ensue.
+(See also <code><a href="#ca_clear_event">ca_clear_subscription</a>()</code>.)</p>
+
 <h4>Arguments</h4>
 <dl>
  <dt><code>CHID</code></dt>
@@ -2833,16 +2847,16 @@ subscriptions (monitors) registered with the channel.</p>

 <h3><code><a name="ca_put">ca_put()</a></code></h3>
 <pre>#include &lt;cadef.h&gt;
-int ca_put ( chtype TYPE, 
-        chid CHID, void *PVALUE ); 
-int ca_array_put ( chtype TYPE, unsigned long COUNT, 
+int ca_put ( chtype TYPE,
+        chid CHID, void *PVALUE );
+int ca_array_put ( chtype TYPE, unsigned long COUNT,
        chid CHID, const void *PVALUE);
 typedef void ( caEventCallBackFunc ) (struct event_handler_args);
-int ca_put_callback ( chtype TYPE, 
-        chid CHID, const void *PVALUE, 
-        caEventCallBackFunc PFUNC, void *USERARG ); 
-int ca_array_put_callback ( chtype TYPE, unsigned long COUNT, 
-        chid CHID, const void *PVALUE, 
+int ca_put_callback ( chtype TYPE,
+        chid CHID, const void *PVALUE,
+        caEventCallBackFunc PFUNC, void *USERARG );
+int ca_array_put_callback ( chtype TYPE, unsigned long COUNT,
+        chid CHID, const void *PVALUE,
        caEventCallBackFunc PFUNC, void *USERARG );</pre>

 <h4>Description</h4>
@@ -3069,7 +3083,7 @@ when a CA get request is initiated.</p>
 typedef void ( caEventCallBackFunc ) (struct event_handler_args);
 int ca_create_subscription ( chtype TYPE, unsigned long COUNT,
        chid CHID, unsigned long MASK,
-        caEventCallBackFunc USERFUNC, void *USERARG, 
+        caEventCallBackFunc USERFUNC, void *USERARG,
        evid *PEVID );</pre>

 <h4>Description</h4>
@@ -3153,7 +3167,7 @@ indicating the current state of the channel.</p>
  <dt><code>MASK</code></dt>
    <dd>A mask with bits set for each of the event trigger types requested. The
      event trigger mask must be a <em>bitwise or</em> of one or more of the
-      following constants. 
+      following constants.
      <ul>
        <li>DBE_VALUE - Trigger events when the channel value exceeds the
          monitor dead band</li>
@@ -3200,6 +3214,13 @@ and not forwarded to the server until one of <code>ca_flush_io()</code>, <code>c
 <code>ca_pend_event()</code>, or <code>ca_sg_block()</code> are called. This allows several requests to be
 efficiently sent together in one message.</p>

+<p>Note: This operation blocks until any user callbacks for this channel
+have run to completion. If callbacks take a lock (mutex) then it is the
+user's responsibility to ensure that this lock is not held when
+<code>ca_clear_subscription()</code> is called, otherwise a deadlock may
+ensue. (See also <code><a
+href="#ca_clear_channel">ca_clear_channel</a>()</code>.)</p>
+
 <h4>Arguments</h4>
 <dl>
  <dt>EVID</dt>
@@ -3364,7 +3385,7 @@ becomes full.</p>

 <h3><code><a name="ca_signal">ca_signal()</a></code></h3>
 <pre>#include &lt;cadef.h&gt;
-int ca_signal ( long CA_STATUS, const char * CONTEXT_STRING ); 
+int ca_signal ( long CA_STATUS, const char * CONTEXT_STRING );
 void SEVCHK( CA_STATUS, CONTEXT_STRING );</pre>

 <h4>Description</h4>
@@ -3381,7 +3402,7 @@ recommended error handler for simple applications which do not wish to write
 code testing the status returned from each channel access call.</p>

 <h4>Examples</h4>
-<pre>status = ca_context_create (...); 
+<pre>status = ca_context_create (...);
 SEVCHK ( status, "Unable to create a CA client context" );</pre>

 <p>If the application only wishes to print the message associated with an error
@@ -3405,7 +3426,7 @@ this purpose.</p>

 <h3><code><a
 name="ca_add_exception_event">ca_add_exception_event()</a></code></h3>
-<pre>#include &lt;cadef.h&gt; 
+<pre>#include &lt;cadef.h&gt;
 typedef void (*pCallback) ( struct exception_handler_args HANDLERARGS );
 int ca_add_exception_event ( pCallback  USERFUNC, void *USERARG );</pre>

@@ -3614,7 +3635,7 @@ specified channel.</p>
  <dt><code>PFUNC</code></dt>
    <dd>Pointer to a user supplied callback function. A null pointer uninstalls
      the current handler. The following arguments are passed <em>by value</em>
-      to the supplied callback handler. 
+      to the supplied callback handler.
      <pre>typedef struct ca_access_rights {
    unsigned    read_access:1;
    unsigned    write_access:1;
@@ -3954,8 +3975,8 @@ type.</p>
 prints diagnostics to standard out.</p>

 <h4>Examples</h4>
-<pre>void ca_test_event (); 
-status = ca_create_subscription ( type, chid, ca_test_event, NULL, NULL ); 
+<pre>void ca_test_event ();
+status = ca_create_subscription ( type, chid, ca_test_event, NULL, NULL );
 SEVCHK ( status, .... );</pre>

 <h4>See Also</h4>
@@ -3989,8 +4010,8 @@ outstanding within them at any given time.</p>
 </dl>

 <h4>Examples</h4>
-<pre>CA_SYNC_GID gid; 
-status = ca_sg_create ( &amp;gid ); 
+<pre>CA_SYNC_GID gid;
+status = ca_sg_create ( &amp;gid );
 SEVCHK ( status, Sync group create failed );</pre>

 <h4>Returns</h4>
@@ -4028,8 +4049,8 @@ int ca_sg_delete ( CA_SYNC_GID GID );</pre>
 </dl>

 <h4>Examples</h4>
-<pre>CA_SYNC_GID gid; 
-status = ca_sg_delete ( gid ); 
+<pre>CA_SYNC_GID gid;
+status = ca_sg_delete ( gid );
 SEVCHK ( status, Sync group delete failed );</pre>

 <h4>Returns</h4>
@@ -4140,7 +4161,7 @@ will not block unless additional subsequent requests are made.</p>
 </dl>

 <h4>Examples</h4>
-<pre>CA_SYNC_GID gid; 
+<pre>CA_SYNC_GID gid;
 status = ca_sg_reset(gid);</pre>

 <h4>Returns</h4>
@@ -4153,7 +4174,7 @@ status = ca_sg_reset(gid);</pre>
 <pre>#include &lt;cadef.h&gt;
 int ca_sg_put ( CA_SYNC_GID GID, chtype TYPE,
        chid CHID, void *PVALUE );
-int ca_sg_array_put ( CA_SYNC_GID GID, chtype TYPE, 
+int ca_sg_array_put ( CA_SYNC_GID GID, chtype TYPE,
        unsigned long COUNT, chid CHID, void *PVALUE );</pre>

 <p>Write a value, or array of values, to a channel and increment the outstanding
@@ -4294,7 +4315,7 @@ reissued.</p>

 <h3><code><a name="ca_client_status">ca_client_status()</a></code></h3>
 <pre>int ca_client_status ( unsigned level );
-int ca_context_status ( struct ca_client_context *CONTEXT, 
+int ca_context_status ( struct ca_client_context *CONTEXT,
       unsigned LEVEL );</pre>

 <h4>Description</h4>
--- a/src/cas/generic/casDGClient.cc
+++ b/src/cas/generic/casDGClient.cc
@@ -646,6 +646,11 @@ caStatus casDGClient::processDG ()
        if ( status != S_cas_success ) {
            break;
        }
+
+        if ( this->in.bytesPresent () > 0 && dgInBytesConsumed == 0 && status == S_cas_success ) {
+            this->in.removeMsg ( this->in.bytesPresent() );
+        }
+
    }
    return status;
 }
--- a/src/db/dbAccess.c
+++ b/src/db/dbAccess.c
@@ -297,10 +297,10 @@ static void get_alarm(DBADDR *paddr, char **ppbuffer,
    if (*options & DBR_AL_LONG) {
        struct dbr_alLong *pal = (struct dbr_alLong*) pbuffer;

-        pal->upper_alarm_limit   = (epicsInt32) ald.upper_alarm_limit;
-        pal->upper_warning_limit = (epicsInt32) ald.upper_warning_limit;
-        pal->lower_warning_limit = (epicsInt32) ald.lower_warning_limit;
-        pal->lower_alarm_limit   = (epicsInt32) ald.lower_alarm_limit;
+        pal->upper_alarm_limit   = finite(ald.upper_alarm_limit) ? (epicsInt32) ald.upper_alarm_limit : 0;
+        pal->upper_warning_limit = finite(ald.upper_warning_limit) ? (epicsInt32) ald.upper_warning_limit : 0;
+        pal->lower_warning_limit = finite(ald.lower_warning_limit) ? (epicsInt32) ald.lower_warning_limit : 0;
+        pal->lower_alarm_limit   = finite(ald.lower_alarm_limit) ? (epicsInt32) ald.lower_alarm_limit : 0;

        if (no_data)
            *options ^= DBR_AL_LONG; /*Turn off option*/
--- a/src/db/dbCa.c
+++ b/src/db/dbCa.c
@@ -591,11 +591,16 @@ static void connectionCallback(struct connection_handler_args arg)
    if (pca->gotFirstConnection) {
        if (pca->nelements != ca_element_count(arg.chid) ||
            pca->dbrType != ca_field_type(arg.chid)) {
-            /* BUG: We have no way to clear any old subscription with the
-             *      originally chosen data type/size.  That will continue
-             *      to send us data and will result in an assert() fail.
-             */
-            /* Let next dbCaGetLink and/or dbCaPutLink determine options */
+            /* Size or type changed, clear everything and let the next call
+               to dbCaGetLink() and/or dbCaPutLink() reset everything */
+            if (pca->evidNative) {
+                ca_clear_event(pca->evidNative);
+                pca->evidNative = 0;
+            }
+            if (pca->evidString) {
+                ca_clear_event(pca->evidString);
+                pca->evidString = 0;
+            }
            plink->value.pv_link.pvlMask &=
                ~(pvlOptInpNative | pvlOptInpString |
                  pvlOptOutNative | pvlOptOutString);
@@ -969,7 +974,8 @@ static void dbCaTask(void *arg)
                status = ca_add_array_event(
                    ca_field_type(pca->chid)+DBR_TIME_STRING,
                    ca_element_count(pca->chid),
-                    pca->chid, eventCallback, pca, 0.0, 0.0, 0.0, 0);
+                    pca->chid, eventCallback, pca, 0.0, 0.0, 0.0,
+                    &pca->evidNative);
                if (status != ECA_NORMAL) {
                    errlogPrintf("dbCaTask ca_add_array_event %s\n",
                        ca_message(status));
@@ -981,7 +987,8 @@ static void dbCaTask(void *arg)
                pca->pgetString = dbCalloc(1, MAX_STRING_SIZE);
                epicsMutexUnlock(pca->lock);
                status = ca_add_array_event(DBR_TIME_STRING, 1,
-                    pca->chid, eventCallback, pca, 0.0, 0.0, 0.0, 0);
+                    pca->chid, eventCallback, pca, 0.0, 0.0, 0.0,
+                    &pca->evidString);
                if (status != ECA_NORMAL) {
                    errlogPrintf("dbCaTask ca_add_array_event %s\n",
                        ca_message(status));
--- a/src/db/dbCaPvt.h
+++ b/src/db/dbCaPvt.h
@@ -73,6 +73,8 @@ typedef struct caLink
 	char		*pgetString;
 	void		*pputNative;
 	char		*pputString;
+	evid		evidNative;
+	evid		evidString;
 	char		gotInNative;
 	char		gotInString;
 	char		gotOutNative;
--- a/src/db/dbEvent.c
+++ b/src/db/dbEvent.c
@@ -90,7 +90,8 @@ struct event_user {
    epicsMutexId        lock;
    epicsEventId        ppendsem;       /* Wait while empty */
    epicsEventId        pflush_sem;     /* wait for flush */
-        
+    epicsEventId        pexitsem;       /* wait for event task to join */
+
    EXTRALABORFUNC      *extralabor_sub;/* off load to event task */
    void                *extralabor_arg;/* parameter to above */
    
@@ -134,7 +135,9 @@ static char *EVENT_PEND_NAME = "eventTask";

 static struct evSubscrip canceledEvent;

-static unsigned short ringSpace ( const struct event_que *pevq ) 
+static epicsMutexId stopSync;
+
+static unsigned short ringSpace ( const struct event_que *pevq )
 {
    if ( pevq->evque[pevq->putix] == EVENTQEMPTY ) {
        if ( pevq->getix > pevq->putix ) {
@@ -274,7 +277,11 @@ int epicsShareAPI dbel ( const char *pname, unsigned level )
 dbEventCtx epicsShareAPI db_init_events (void)
 {
    struct event_user * evUser;
-    
+
+    if (!stopSync) {
+        stopSync = epicsMutexMustCreate();
+    }
+
    if (!dbevEventUserFreeList) {
        freeListInitPvt(&dbevEventUserFreeList, 
            sizeof(struct event_user),8);
@@ -293,38 +300,49 @@ dbEventCtx epicsShareAPI db_init_events (void)
    if (!evUser) {
        return NULL;
    }
-    
+
+    /* Flag will be cleared when event task starts */
+    evUser->pendexit = TRUE;
+
    evUser->firstque.evUser = evUser;
    evUser->firstque.writelock = epicsMutexCreate();
-    if (!evUser->firstque.writelock) {
-        return NULL;
-    }
+    if (!evUser->firstque.writelock)
+        goto fail;

    evUser->ppendsem = epicsEventCreate(epicsEventEmpty);
-    if (!evUser->ppendsem) {
-        epicsMutexDestroy (evUser->firstque.writelock);
-        return NULL;
-    }    
+    if (!evUser->ppendsem)
+        goto fail;
    evUser->pflush_sem = epicsEventCreate(epicsEventEmpty);
-    if (!evUser->pflush_sem) {
-        epicsMutexDestroy (evUser->firstque.writelock);
-        epicsEventDestroy (evUser->ppendsem);
-        return NULL;
-    }
+    if (!evUser->pflush_sem)
+        goto fail;
    evUser->lock = epicsMutexCreate();
-    if (!evUser->lock) {
-        epicsMutexDestroy (evUser->firstque.writelock);
-        epicsEventDestroy (evUser->pflush_sem);
-        epicsEventDestroy (evUser->ppendsem);
-        return NULL;
-    }
+    if (!evUser->lock)
+        goto fail;
+    evUser->pexitsem = epicsEventCreate(epicsEventEmpty);
+    if (!evUser->pexitsem)
+        goto fail;

    evUser->flowCtrlMode = FALSE;
    evUser->extraLaborBusy = FALSE;
    evUser->pSuicideEvent = NULL;
    return (dbEventCtx) evUser;
+fail:
+    if(evUser->lock)
+        epicsMutexDestroy (evUser->lock);
+    if(evUser->firstque.writelock)
+        epicsMutexDestroy (evUser->firstque.writelock);
+    if(evUser->ppendsem)
+        epicsEventDestroy (evUser->ppendsem);
+    if(evUser->pflush_sem)
+        epicsEventDestroy (evUser->pflush_sem);
+    if(evUser->pexitsem)
+        epicsEventDestroy (evUser->pexitsem);
+    freeListFree(dbevEventUserFreeList,evUser);
+    return NULL;
 }

+
+    /* intentionally leak stopSync to avoid possible shutdown races */
 /*
 *  DB_CLOSE_EVENTS()
 *  
@@ -346,10 +364,30 @@ void epicsShareAPI db_close_events (dbEventCtx ctx)
     * hazardous to the system's health.
     */
    epicsMutexMustLock ( evUser->lock );
-    evUser->pendexit = TRUE;
+    if(!evUser->pendexit) { /* event task running */
+        evUser->pendexit = TRUE;
+        epicsMutexUnlock ( evUser->lock );
+
+        /* notify the waiting task */
+        epicsEventSignal(evUser->ppendsem);
+        /* wait for task to exit */
+        epicsEventMustWait(evUser->pexitsem);
+
+        epicsMutexMustLock ( evUser->lock );
+    }
+
    epicsMutexUnlock ( evUser->lock );
-    /* notify the waiting task */
-    epicsEventSignal(evUser->ppendsem);
+
+    epicsMutexMustLock (stopSync);
+
+    epicsEventDestroy(evUser->pexitsem);
+    epicsEventDestroy(evUser->ppendsem);
+    epicsEventDestroy(evUser->pflush_sem);
+    epicsMutexDestroy(evUser->lock);
+
+    epicsMutexUnlock (stopSync);
+
+    freeListFree(dbevEventUserFreeList, evUser);
 }

 /*
@@ -977,14 +1015,17 @@ static void event_task (void *pParm)
        }
    }

-    epicsEventDestroy(evUser->ppendsem);
-    epicsEventDestroy(evUser->pflush_sem);
-    epicsMutexDestroy(evUser->lock);
-
-    freeListFree(dbevEventUserFreeList, evUser);
-
    taskwdRemove(epicsThreadGetIdSelf());

+    /* use stopSync to ensure pexitsem is not destroy'd
+     * until epicsEventSignal() has returned.
+     */
+    epicsMutexMustLock (stopSync);
+
+    epicsEventSignal(evUser->pexitsem);
+
+    epicsMutexUnlock(stopSync);
+
    return;
 }

@@ -1008,7 +1049,6 @@ int epicsShareAPI db_start_events (
         return DB_EVENT_OK;
     }

-     evUser->pendexit = FALSE;
     evUser->init_func = init_func;
     evUser->init_func_arg = init_func_arg;
     if (!taskname) {
@@ -1022,6 +1062,7 @@ int epicsShareAPI db_start_events (
         epicsMutexUnlock ( evUser->lock );
         return DB_EVENT_ERROR;
     }
+     evUser->pendexit = FALSE;
     epicsMutexUnlock ( evUser->lock );
     return DB_EVENT_OK;
 }
--- a/src/makeBaseApp/top/exampleApp/src/xxxRecord.c
+++ b/src/makeBaseApp/top/exampleApp/src/xxxRecord.c
@@ -198,8 +198,8 @@ static long get_alarm_double(DBADDR *paddr,struct dbr_alDouble *pad)

 static void checkAlarms(xxxRecord *prec)
 {
-	double		val;
-	float		hyst, lalm, hihi, high, low, lolo;
+    double		val, hyst, lalm;
+    float		hihi, high, low, lolo;
 	unsigned short	hhsv, llsv, hsv, lsv;

 	if(prec->udf == TRUE ){
--- a/src/rec/longinRecord.c
+++ b/src/rec/longinRecord.c
@@ -21,6 +21,7 @@

 #include "dbDefs.h"
 #include "epicsPrint.h"
+#include "epicsMath.h"
 #include "alarm.h"
 #include "dbAccess.h"
 #include "dbEvent.h"
@@ -201,10 +202,10 @@ static long get_alarm_double(DBADDR *paddr, struct dbr_alDouble	*pad)
    longinRecord *prec=(longinRecord *)paddr->precord;

    if(paddr->pfield==(void *)&prec->val){
-         pad->upper_alarm_limit = prec->hihi;
-         pad->upper_warning_limit = prec->high;
-         pad->lower_warning_limit = prec->low;
-         pad->lower_alarm_limit = prec->lolo;
+        pad->upper_alarm_limit = prec->hhsv ? prec->hihi : epicsNAN;
+        pad->upper_warning_limit = prec->hsv ? prec->high : epicsNAN;
+        pad->lower_warning_limit = prec->lsv ? prec->low : epicsNAN;
+        pad->lower_alarm_limit = prec->llsv ? prec->lolo : epicsNAN;
    } else recGblGetAlarmDouble(paddr,pad);
    return(0);
 }
--- a/src/rec/longoutRecord.c
+++ b/src/rec/longoutRecord.c
@@ -19,6 +19,7 @@

 #include "dbDefs.h"
 #include "epicsPrint.h"
+#include "epicsMath.h"
 #include "alarm.h"
 #include "dbAccess.h"
 #include "dbEvent.h"
@@ -242,10 +243,10 @@ static long get_alarm_double(DBADDR *paddr,struct dbr_alDouble *pad)
    int     fieldIndex = dbGetFieldIndex(paddr);

    if(fieldIndex == longoutRecordVAL) {
-         pad->upper_alarm_limit = prec->hihi;
-         pad->upper_warning_limit = prec->high;
-         pad->lower_warning_limit = prec->low;
-         pad->lower_alarm_limit = prec->lolo;
+        pad->upper_alarm_limit = prec->hhsv ? prec->hihi : epicsNAN;
+        pad->upper_warning_limit = prec->hsv ? prec->high : epicsNAN;
+        pad->lower_warning_limit = prec->lsv ? prec->low : epicsNAN;
+        pad->lower_alarm_limit = prec->llsv ? prec->lolo : epicsNAN;
    } else recGblGetAlarmDouble(paddr,pad);
    return(0);
 }
--- a/src/tools/convertRelease.pl
+++ b/src/tools/convertRelease.pl
@@ -21,8 +21,7 @@ use Getopt::Std;
 use EPICS::Path;
 use EPICS::Release;

-use vars qw($arch $top $iocroot $root);
-
+our ($arch, $top, $iocroot, $root);
 our ($opt_a, $opt_t, $opt_T);

 $Getopt::Std::OUTPUT_HELP_VERSION = 1;
Author	SHA1	Message	Date
Andrew Johnson	20d2cff501	Update version number to 3.14.12.8-rc1	2018-07-19 12:31:52 -05:00
Andrew Johnson	860ce156a2	Documentation updates for 3.14.12.8	2018-07-19 12:20:41 -05:00
Andrew Johnson	31fc35fbe8	dbCa: Fix for lp: #541221 I'd looked at this a few times since it was reported, but never actually fixed the bug I described in the comments. Apparently the only thing left to do was to store the eventId and use it to clear the subscription when we saw a type-change to a PV.	2018-07-13 13:05:54 -05:00
Ralph Lange	e459e8bdd4	cas: don't spin on zero-length search requests (fix lp:1743321)	2018-06-07 11:32:16 +02:00
Ralph Lange	b558bd9b16	Cherry-picking `e794639e` from 3.15 (lp:1730982 lp:1762543)	2018-06-07 11:21:04 +02:00
Michael Davidsaver	3c16c3c0da	Cherry-picking `d2b0e920` from 3.15 (closes lp:1773373)	2018-06-07 11:07:29 +02:00
Andrew Johnson	67844bacc3	Perl s/use vars/our/	2018-05-28 16:13:14 -05:00
Ralph Lange	7e7d230d8c	templates: fix warnings for xxxRecord.c in exampleApp (fixes #1772833)	2018-05-23 09:24:56 +02:00
Andrew Johnson	c1ece40f41	Updated Release Notes for Base-3.14.12.8	2018-05-19 22:42:23 -05:00
Andrew Johnson	a732539eee	epicsMath.h defines 'finite()' not 'isfinite()'	2018-05-19 21:14:36 -05:00
Ralph Lange	3bc0805a89	rec: fix missing includes in longin/longout	2018-05-18 09:54:42 +02:00
Ralph Lange	c72e35c769	Merge Ralph's fix-1770292 branch into 3.14	2018-05-17 17:16:07 +02:00
Ralph Lange	2d9c5e99a1	db: correctly convert NaN alarm levels to integers (fixes lp #1771298)	2018-05-15 11:18:11 +02:00
Ralph Lange	ca22d50831	rec: consistent get_alarm_double() for longin/longout (fixes lp #1770292)	2018-05-15 11:18:10 +02:00
Andrew Johnson	5cb91d9f6d	Merge Ben Franksen's deadlock_warning branch into 3.14	2018-05-12 20:20:30 -05:00
Benjamin Franksen	91ce807e8b	Fix for lp: #1751380 Add warnings about possible deadlock to the docs for ca_clear_channel, ca_clear_subscription, and ca_context_destroy.	2018-04-11 12:58:28 +02:00