Skip to content

Allow inserting feature flag macros on info fields #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GDYendell wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Allow inserting feature flag macros on info fields #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
622eb81
Allow inserting feature flag macros on info fields
GDYendell Feb 1, 2023
8a36487
Apply patch to fix EPICS base build in CI
GDYendell Feb 7, 2023
b394df5
Update to codecov-action@v3
GDYendell Feb 8, 2023
ebe9669
Remove python 2.7 and 3.6 support
GDYendell Feb 10, 2023
50cf4cf
Help pipenv to regenerate Pipfile.lock
GDYendell Feb 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions .github/workflows/code.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,6 @@ jobs:
fail-fast: false
matrix:
include:
# DLS RHEL7 legacy
- os: ubuntu-latest
python: "2.7"
publish: true
epics: "R3.14.12.7"
# sphinx deps don't work on 2.7, so install manually
pipenv: "--skip-lock && pipenv run pip install pytest-cov pytest-flake8"

# DLS RHEL7 python3 current
- os: ubuntu-latest
python: "3.7"
Expand Down Expand Up @@ -61,8 +53,11 @@ jobs:
run: |
wget -nv https://github.com/epics-base/epics-base/archive/${{ matrix.epics }}.tar.gz
tar -zxf ${{ matrix.epics }}.tar.gz
make -sj -C epics-base-${{ matrix.epics }}
echo "EPICS_BASE=`pwd`/epics-base-${{ matrix.epics }}" >> $GITHUB_ENV
cp .github/workflows/epics-base-${{ matrix.epics }}.patch epics-base-${{ matrix.epics }}
cd epics-base-${{ matrix.epics }}
patch -p1 < epics-base-${{ matrix.epics }}.patch
make -sj
echo "EPICS_BASE=`pwd`" >> $GITHUB_ENV

- name: Install Python Dependencies
# Pin pipenv so it works on python2.7
Expand Down Expand Up @@ -103,7 +98,7 @@ jobs:
run: twine upload dist/*

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v3
with:
name: ${{ matrix.os }}/${{ matrix.python }}/${{ matrix.epics }}
files: cov.xml
127 changes: 127 additions & 0 deletions .github/workflows/epics-base-R3.14.12.7.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
diff --git a/src/cas/generic/caServerI.h b/src/cas/generic/caServerI.h
index b45d9373a..e31b210a7 100644
--- a/src/cas/generic/caServerI.h
+++ b/src/cas/generic/caServerI.h
@@ -88,8 +88,8 @@ public:
private:
clientBufMemoryManager clientBufMemMgr;
tsFreeList < casMonitor, 1024 > casMonitorFreeList;
- tsDLList < casStrmClient > clientList;
- tsDLList < casIntfOS > intfList;
+ ::tsDLList < casStrmClient > clientList;
+ ::tsDLList < casIntfOS > intfList;
mutable epicsMutex mutex;
mutable epicsMutex diagnosticCountersMutex;
caServer & adapter;
diff --git a/src/cas/generic/casPVI.cc b/src/cas/generic/casPVI.cc
index 0b02a6cbf..8d2d27096 100644
--- a/src/cas/generic/casPVI.cc
+++ b/src/cas/generic/casPVI.cc
@@ -286,7 +286,7 @@ void casPVI::postEvent ( const casEventMask & select, const gdd & event )
}

caStatus casPVI::installMonitor (
- casMonitor & mon, tsDLList < casMonitor > & monitorList )
+ casMonitor & mon, ::tsDLList < casMonitor > & monitorList )
{
epicsGuard < epicsMutex > guard ( this->mutex );
assert ( this->nMonAttached < UINT_MAX );
@@ -302,7 +302,7 @@ caStatus casPVI::installMonitor (
}

casMonitor * casPVI::removeMonitor (
- tsDLList < casMonitor > & list, ca_uint32_t clientIdIn )
+ ::tsDLList < casMonitor > & list, ca_uint32_t clientIdIn )
{
epicsGuard < epicsMutex > guard ( this->mutex );
casMonitor * pMon = 0;
@@ -359,8 +359,8 @@ void casPVI::installChannel ( chanIntfForPV & chan )
}

void casPVI::removeChannel (
- chanIntfForPV & chan, tsDLList < casMonitor > & src,
- tsDLList < casMonitor > & dest )
+ chanIntfForPV & chan, ::tsDLList < casMonitor > & src,
+ ::tsDLList < casMonitor > & dest )
{
epicsGuard < epicsMutex > guard ( this->mutex );
src.removeAll ( dest );
@@ -374,7 +374,7 @@ void casPVI::removeChannel (
}
}

-void casPVI::clearOutstandingReads ( tsDLList < casAsyncIOI > & ioList )
+void casPVI::clearOutstandingReads ( ::tsDLList < casAsyncIOI > & ioList )
{
epicsGuard < epicsMutex > guard ( this->mutex );

@@ -394,7 +394,7 @@ void casPVI::clearOutstandingReads ( tsDLList < casAsyncIOI > & ioList )
}
}

-void casPVI::destroyAllIO ( tsDLList < casAsyncIOI > & ioList )
+void casPVI::destroyAllIO ( ::tsDLList < casAsyncIOI > & ioList )
{
epicsGuard < epicsMutex > guard ( this->mutex );
while ( casAsyncIOI * pIO = ioList.get() ) {
@@ -406,7 +406,7 @@ void casPVI::destroyAllIO ( tsDLList < casAsyncIOI > & ioList )
}

void casPVI::installIO (
- tsDLList < casAsyncIOI > & ioList, casAsyncIOI & io )
+ ::tsDLList < casAsyncIOI > & ioList, casAsyncIOI & io )
{
epicsGuard < epicsMutex > guard ( this->mutex );
ioList.add ( io );
@@ -415,7 +415,7 @@ void casPVI::installIO (
}

void casPVI::uninstallIO (
- tsDLList < casAsyncIOI > & ioList, casAsyncIOI & io )
+ ::tsDLList < casAsyncIOI > & ioList, casAsyncIOI & io )
{
{
epicsGuard < epicsMutex > guard ( this->mutex );
diff --git a/src/cas/generic/casPVI.h b/src/cas/generic/casPVI.h
index feea79d23..7ecf588b8 100644
--- a/src/cas/generic/casPVI.h
+++ b/src/cas/generic/casPVI.h
@@ -49,21 +49,21 @@ public:
caStatus attachToServer ( caServerI & cas );
aitIndex nativeCount ();
bool ioIsPending () const;
- void clearOutstandingReads ( tsDLList < class casAsyncIOI > &);
+ void clearOutstandingReads ( ::tsDLList < class casAsyncIOI > &);
void destroyAllIO (
- tsDLList < casAsyncIOI > & );
+ ::tsDLList < casAsyncIOI > & );
void installIO (
- tsDLList < casAsyncIOI > &, casAsyncIOI & );
+ ::tsDLList < casAsyncIOI > &, casAsyncIOI & );
void uninstallIO (
- tsDLList < casAsyncIOI > &, casAsyncIOI & );
+ ::tsDLList < casAsyncIOI > &, casAsyncIOI & );
void installChannel ( chanIntfForPV & chan );
void removeChannel (
- chanIntfForPV & chan, tsDLList < casMonitor > & src,
- tsDLList < casMonitor > & dest );
+ chanIntfForPV & chan, ::tsDLList < casMonitor > & src,
+ ::tsDLList < casMonitor > & dest );
caStatus installMonitor (
- casMonitor & mon, tsDLList < casMonitor > & monitorList );
+ casMonitor & mon, ::tsDLList < casMonitor > & monitorList );
casMonitor * removeMonitor (
- tsDLList < casMonitor > & list, ca_uint32_t clientIdIn );
+ ::tsDLList < casMonitor > & list, ca_uint32_t clientIdIn );
void deleteSignal ();
void postEvent ( const casEventMask & select, const gdd & event );
caServer * getExtServer () const;
@@ -84,7 +84,7 @@ public:

private:
mutable epicsMutex mutex;
- tsDLList < chanIntfForPV > chanList;
+ ::tsDLList < chanIntfForPV > chanList;
gddEnumStringTable enumStrTbl;
caServerI * pCAS;
casPV * pPV;
127 changes: 127 additions & 0 deletions .github/workflows/epics-base-R3.15.8.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
diff --git a/src/ca/legacy/pcas/generic/caServerI.h b/src/ca/legacy/pcas/generic/caServerI.h
index 012233693..bfedf55ae 100644
--- a/src/ca/legacy/pcas/generic/caServerI.h
+++ b/src/ca/legacy/pcas/generic/caServerI.h
@@ -88,8 +88,8 @@ public:
private:
clientBufMemoryManager clientBufMemMgr;
tsFreeList < casMonitor, 1024 > casMonitorFreeList;
- tsDLList < casStrmClient > clientList;
- tsDLList < casIntfOS > intfList;
+ ::tsDLList < casStrmClient > clientList;
+ ::tsDLList < casIntfOS > intfList;
mutable epicsMutex mutex;
mutable epicsMutex diagnosticCountersMutex;
caServer & adapter;
diff --git a/src/ca/legacy/pcas/generic/casPVI.cc b/src/ca/legacy/pcas/generic/casPVI.cc
index 245c51e01..5ae1f522e 100644
--- a/src/ca/legacy/pcas/generic/casPVI.cc
+++ b/src/ca/legacy/pcas/generic/casPVI.cc
@@ -291,7 +291,7 @@ void casPVI::postEvent ( const casEventMask & select, const gdd & event )
}

caStatus casPVI::installMonitor (
- casMonitor & mon, tsDLList < casMonitor > & monitorList )
+ casMonitor & mon, ::tsDLList < casMonitor > & monitorList )
{
epicsGuard < epicsMutex > guard ( this->mutex );
assert ( this->nMonAttached < UINT_MAX );
@@ -307,7 +307,7 @@ caStatus casPVI::installMonitor (
}

casMonitor * casPVI::removeMonitor (
- tsDLList < casMonitor > & list, ca_uint32_t clientIdIn )
+ ::tsDLList < casMonitor > & list, ca_uint32_t clientIdIn )
{
epicsGuard < epicsMutex > guard ( this->mutex );
casMonitor * pMon = 0;
@@ -364,8 +364,8 @@ void casPVI::installChannel ( chanIntfForPV & chan )
}

void casPVI::removeChannel (
- chanIntfForPV & chan, tsDLList < casMonitor > & src,
- tsDLList < casMonitor > & dest )
+ chanIntfForPV & chan, ::tsDLList < casMonitor > & src,
+ ::tsDLList < casMonitor > & dest )
{
epicsGuard < epicsMutex > guard ( this->mutex );
src.removeAll ( dest );
@@ -379,7 +379,7 @@ void casPVI::removeChannel (
}
}

-void casPVI::clearOutstandingReads ( tsDLList < casAsyncIOI > & ioList )
+void casPVI::clearOutstandingReads ( ::tsDLList < casAsyncIOI > & ioList )
{
epicsGuard < epicsMutex > guard ( this->mutex );

@@ -399,7 +399,7 @@ void casPVI::clearOutstandingReads ( tsDLList < casAsyncIOI > & ioList )
}
}

-void casPVI::destroyAllIO ( tsDLList < casAsyncIOI > & ioList )
+void casPVI::destroyAllIO ( ::tsDLList < casAsyncIOI > & ioList )
{
epicsGuard < epicsMutex > guard ( this->mutex );
while ( casAsyncIOI * pIO = ioList.get() ) {
@@ -411,7 +411,7 @@ void casPVI::destroyAllIO ( tsDLList < casAsyncIOI > & ioList )
}

void casPVI::installIO (
- tsDLList < casAsyncIOI > & ioList, casAsyncIOI & io )
+ ::tsDLList < casAsyncIOI > & ioList, casAsyncIOI & io )
{
epicsGuard < epicsMutex > guard ( this->mutex );
ioList.add ( io );
@@ -420,7 +420,7 @@ void casPVI::installIO (
}

void casPVI::uninstallIO (
- tsDLList < casAsyncIOI > & ioList, casAsyncIOI & io )
+ ::tsDLList < casAsyncIOI > & ioList, casAsyncIOI & io )
{
{
epicsGuard < epicsMutex > guard ( this->mutex );
diff --git a/src/ca/legacy/pcas/generic/casPVI.h b/src/ca/legacy/pcas/generic/casPVI.h
index feea79d23..7ecf588b8 100644
--- a/src/ca/legacy/pcas/generic/casPVI.h
+++ b/src/ca/legacy/pcas/generic/casPVI.h
@@ -49,21 +49,21 @@ public:
caStatus attachToServer ( caServerI & cas );
aitIndex nativeCount ();
bool ioIsPending () const;
- void clearOutstandingReads ( tsDLList < class casAsyncIOI > &);
+ void clearOutstandingReads ( ::tsDLList < class casAsyncIOI > &);
void destroyAllIO (
- tsDLList < casAsyncIOI > & );
+ ::tsDLList < casAsyncIOI > & );
void installIO (
- tsDLList < casAsyncIOI > &, casAsyncIOI & );
+ ::tsDLList < casAsyncIOI > &, casAsyncIOI & );
void uninstallIO (
- tsDLList < casAsyncIOI > &, casAsyncIOI & );
+ ::tsDLList < casAsyncIOI > &, casAsyncIOI & );
void installChannel ( chanIntfForPV & chan );
void removeChannel (
- chanIntfForPV & chan, tsDLList < casMonitor > & src,
- tsDLList < casMonitor > & dest );
+ chanIntfForPV & chan, ::tsDLList < casMonitor > & src,
+ ::tsDLList < casMonitor > & dest );
caStatus installMonitor (
- casMonitor & mon, tsDLList < casMonitor > & monitorList );
+ casMonitor & mon, ::tsDLList < casMonitor > & monitorList );
casMonitor * removeMonitor (
- tsDLList < casMonitor > & list, ca_uint32_t clientIdIn );
+ ::tsDLList < casMonitor > & list, ca_uint32_t clientIdIn );
void deleteSignal ();
void postEvent ( const casEventMask & select, const gdd & event );
caServer * getExtServer () const;
@@ -84,7 +84,7 @@ public:

private:
mutable epicsMutex mutex;
- tsDLList < chanIntfForPV > chanList;
+ ::tsDLList < chanIntfForPV > chanList;
gddEnumStringTable enumStrTbl;
caServerI * pCAS;
casPV * pPV;
6 changes: 5 additions & 1 deletion Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ atomicwrites = "*"

# Test and docs deps
pytest-cov = "*"
pytest-flake8 = "*"
# remove this dependency once flake8 has dropped "importlib-metadata <=4.3"
# https://github.com/PyCQA/flake8/pull/1438
flake8 = "<=3.9.2"
importlib-metadata = "<5"
pytest-flake8 = "<=1.1.0"
sphinx-rtd-theme = "*"

[packages]
Expand Down
Loading