epics/pvxs
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix registering functions with EPICS

Browse Source 
Replace index_sequence implementation with one compatible with C++14
which also properly initializes arguments. Secondly, changed args to be array
of pointers instead of array of entries. This seems to fix problems and allows
to invoke functions from ioc shell.
This commit is contained in:
Vodopivec, Klemen
2020-05-01 16:23:43 -04:00
committed by Michael Davidsaver
parent 6bbcf8aebb
commit eb11d9e1bc
1 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ioc/iochooks.cpp
+26 -24
View File
@@ -69,32 +69,33 @@ void pvxsr(int detail)
}
}
template <size_t... Ns>
struct index_sequence {};
// index_sequence from:
//http://stackoverflow.com/questions/17424477/implementation-c14-make-integer-sequence
template<typename Tag>
struct next_index_sequence {};
template<size_t... Ns>
struct next_index_sequence<index_sequence<Ns...>>
{
typedef index_sequence<Ns..., sizeof...(Ns)> type;
template< std::size_t ... I >
struct index_sequence {
using type = index_sequence;
using value_type = std::size_t;
static constexpr std::size_t size() {
return sizeof ... (I);
}
};
template<size_t I, size_t Cnt, size_t... Idxs>
struct build_index_sequence
{
typedef typename build_index_sequence<I+1, Cnt, Idxs..., I+1>::type type;
};
template< typename Seq1, typename Seq2 >
struct concat_sequence;
template<size_t Cnt, size_t... Idxs>
struct build_index_sequence<Cnt, Cnt, Idxs...>
{
typedef index_sequence<Idxs...> type;
};
template< std::size_t ... I1, std::size_t ... I2 >
struct concat_sequence< index_sequence< I1 ... >, index_sequence< I2 ... > > : public index_sequence< I1 ..., (sizeof ... (I1)+I2) ... > {};
template<typename ...Args>
using make_index_sequence = typename build_index_sequence<0, sizeof...(Args)>::type;
template< std::size_t I >
struct make_index_sequence : public concat_sequence< typename make_index_sequence< I/2 >::type,
typename make_index_sequence< I-I/2 >::type > {};
template<>
struct make_index_sequence< 0 > : public index_sequence<> {};
template<>
struct make_index_sequence< 1 > : public index_sequence< 0 > {};
template<typename E>
struct Arg;
@@ -140,8 +141,9 @@ struct Reg {
template<void (*fn)(Args...), size_t... Idxs>
void doit(index_sequence<Idxs...>)
{
static const iocshArg args[sizeof...(Args)] = {{argnames[Idxs], Arg<Args>::code}...};
static const iocshFuncDef def = {name, sizeof...(Args), (const iocshArg* const*)&args};
static const iocshArg argstack[sizeof...(Args)] = {{argnames[Idxs], Arg<Args>::code}...};
static const iocshArg * const args[] = {&argstack[Idxs]...};
static const iocshFuncDef def = {name, sizeof...(Args), args};
iocshRegister(&def, &call<fn, Idxs...>);
}
@@ -149,7 +151,7 @@ struct Reg {
template<void (*fn)(Args...)>
void ister()
{
doit<fn>(make_index_sequence<Args...>{});
doit<fn>(make_index_sequence<sizeof...(Args)>{});
}
};