Argonne National Laboratory

Experimental Physics and
Industrial Control System

1994  1995  1996  1997  1998  1999  2000  2001  2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  2017  <20182019  2020  Index 1994  1995  1996  1997  1998  1999  2000  2001  2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  2017  <20182019  2020 
<== Date ==> <== Thread ==>

Subject: A recent R3.15.5 Patch file
From: Jeong Han Lee <citadel.lee@gmail.com>
To: "tech-talk@aps.anl.gov" <tech-talk@aps.anl.gov>
Date: Mon, 28 May 2018 14:16:33 +0200
Hi

  I was applying the recent patch

  from https://epics.anl.gov/base/R3-15/5-docs/KnownProblems.html

  The name is fix-ipAddrToAscii.patch as

   https://epics.anl.gov/base/R3-15/5-docs/fix-ipAddrToAscii.patch


I am using the following patch command and options in order to apply patch files based on fd53e17 in 3.15.5

   patch -d epics_base --ignore-whitespace -p0 < patch_files_p0.patch


  Two points I would like to ask

1) The patch file is p1 patch file, but all other patch files in R3.15.5 and its instruction are belong in the same page is p0. Should we use the same way to patch base?

    FYI, base 3.15.5 uses p0, and base 3.16.1 uses p1 patch

I am using the following patch command and options in order to apply patch files based on

   patch -d epics_base --ignore-whitespace -p0 < patch_files_p0.patch

  2) After making them p0, I have the error messages as follows:


/R3.15.5/fix-ipAddrToAscii_p0.patch
patching file src/libCom/misc/ipAddrToAsciiAsynchronous.cpp
Hunk #1 succeeded at 18 with fuzz 2.
Hunk #3 succeeded at 55 with fuzz 2 (offset -1 lines).
Hunk #4 succeeded at 76 (offset -1 lines).
Hunk #5 FAILED at 139.
Hunk #6 succeeded at 155 (offset -1 lines).
Hunk #7 succeeded at 234 (offset -1 lines).
Hunk #8 succeeded at 270 (offset -8 lines).
Hunk #9 succeeded at 321 (offset -8 lines).
Hunk #10 succeeded at 331 (offset -8 lines).
Hunk #11 succeeded at 355 (offset -8 lines).
Hunk #12 succeeded at 409 (offset -8 lines).
Hunk #13 succeeded at 432 (offset -8 lines).
Hunk #14 succeeded at 449 (offset -8 lines).
1 out of 14 hunks FAILED -- saving rejects to file src/libCom/misc/ipAddrToAsciiAsynchronous.cpp.rej (please see the enclosed file)

  Could anyone help me to figure out how to remote this FAILED?

  Best,
  Han


--- src/libCom/misc/ipAddrToAsciiAsynchronous.cpp
+++ src/libCom/misc/ipAddrToAsciiAsynchronous.cpp
@@ -139,12 +154,24 @@ ipAddrToAsciiEngine::~ipAddrToAsciiEngine () {}
 static void ipAddrToAsciiEngineGlobalMutexConstruct ( void * )
 {
     try{
-        ipAddrToAsciiEnginePrivate::pEngine = new ipAddrToAsciiEnginePrivate ();
+        ipAddrToAsciiEnginePrivate::pEngine = new ipAddrToAsciiGlobal ();
     }catch(std::exception& e){
         errlogPrintf("ipAddrToAsciiEnginePrivate ctor fails with: %s\n", e.what());
     }
 }
 
+void ipAddrToAsciiEngine::cleanup()
+{
+    {
+        epicsGuard<epicsMutex> G(ipAddrToAsciiEnginePrivate::pEngine->mutex);
+        ipAddrToAsciiEnginePrivate::pEngine->exitFlag = true;
+    }
+    ipAddrToAsciiEnginePrivate::pEngine->laborEvent.signal();
+    ipAddrToAsciiEnginePrivate::pEngine->thread.exitWait();
+    delete ipAddrToAsciiEnginePrivate::pEngine;
+    ipAddrToAsciiEnginePrivate::pEngine = 0;
+}
+
 // for now its probably sufficent to allocate one 
 // DNS transaction thread for all codes sharing
 // the same process that need DNS services but we 

Replies:
Re: A recent R3.15.5 Patch file Andrew Johnson

Navigate by Date:
Prev: RE: Re: Installation of RTEMS and EPICS on MVME6100 유진성
Next: ADPvcam: can't create IOC because of missing build (bin) folder Häbel, Catharina
Index: 1994  1995  1996  1997  1998  1999  2000  2001  2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  2017  <20182019  2020 
Navigate by Thread:
Prev: RE: Open .opi filenames with spaces from command line? Mark Rivers
Next: Re: A recent R3.15.5 Patch file Andrew Johnson
Index: 1994  1995  1996  1997  1998  1999  2000  2001  2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  2017  <20182019  2020 
ANJ, 20 Jun 2018 Valid HTML 4.01! · Home · News · About · Base · Modules · Extensions · Distributions · Download ·
· Search · EPICS V4 · IRMIS · Talk · Bugs · Documents · Links · Licensing ·