Skip to content

Commit c3da2ee

Browse files
author
Peter Zion
committed
Linux fixes
1 parent bdd70d1 commit c3da2ee

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

Diff for: DGGraphImpl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2427,7 +2427,7 @@ void DGGraphImpl::getDGPortInfo(FabricCore::Variant & portInfo, FabricCore::RTVa
24272427

24282428
if(persistenceContextRT.isValid())
24292429
{
2430-
FabricCore::RTVal rtVal = it->second->getRTVal( FabricSplice::LockType_Context );
2430+
FabricCore::RTVal rtVal = it->second->getRTVal( FabricSplice::LockType_Shared );
24312431
if(rtVal.isValid())
24322432
{
24332433
if(rtVal.isObject())

Diff for: DGPortImpl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ bool DGPortImpl::copyArrayDataFromDGPort(DGPortImplPtr other, uint32_t slice, ui
558558
try
559559
{
560560
other->mDGNode.getMemberSliceArrayData_lockType(
561-
FabricCore::LockType_Context, other->mMember.c_str(), otherSlice, bufferSize, buffer
561+
FabricCore::LockType_Shared, other->mMember.c_str(), otherSlice, bufferSize, buffer
562562
);
563563
}
564564
catch(FabricCore::Exception e)

Diff for: DGPortImpl.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ namespace FabricSpliceImpl
132132
)
133133
{
134134
return getRTVal_lockType(
135-
FabricCore::LockType_Context,
135+
FabricCore::LockType_Shared,
136136
evaluate,
137137
slice,
138138
errorOut
@@ -153,7 +153,7 @@ namespace FabricSpliceImpl
153153
)
154154
{
155155
return setRTVal_lockType(
156-
FabricCore::LockType_Context,
156+
FabricCore::LockType_Shared,
157157
value,
158158
slice,
159159
errorOut
@@ -187,7 +187,7 @@ namespace FabricSpliceImpl
187187
)
188188
{
189189
return getArrayData_lockType(
190-
FabricCore::LockType_Context,
190+
FabricCore::LockType_Shared,
191191
buffer,
192192
bufferSize,
193193
slice,
@@ -213,7 +213,7 @@ namespace FabricSpliceImpl
213213
)
214214
{
215215
return setArrayData_lockType(
216-
FabricCore::LockType_Context,
216+
FabricCore::LockType_Shared,
217217
buffer,
218218
bufferSize,
219219
slice,

Diff for: FabricSplice.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -1751,8 +1751,8 @@ enum FECS_DGPort_Mode
17511751
};
17521752

17531753
typedef FEC_LockType FECS_LockType;
1754-
#define FECS_LockType_Context FEC_LockType_Context
1755-
#define FECS_LockType_None FEC_LockType_None
1754+
#define FECS_LockType_Shared FEC_LockType_Shared
1755+
#define FECS_LockType_Exclusive FEC_LockType_Exclusive
17561756

17571757
// C functions
17581758
//=====================================================
@@ -2052,8 +2052,8 @@ namespace FabricSplice
20522052
};
20532053

20542054
typedef FECS_LockType LockType;
2055-
static const LockType LockType_Context = FEC_LockType_Context;
2056-
static const LockType LockType_None = FEC_LockType_None;
2055+
static const LockType LockType_Shared = FEC_LockType_Shared;
2056+
static const LockType LockType_Exclusive = FEC_LockType_Exclusive;
20572057

20582058
class Exception
20592059
{
@@ -3813,7 +3813,7 @@ namespace FabricSplice
38133813
FabricCore::RTVal getRTVal(bool evaluate = false, uint32_t slice = 0)
38143814
{
38153815
return getRTVal_lockType(
3816-
FabricCore::LockType_Context,
3816+
FabricCore::LockType_Shared,
38173817
evaluate,
38183818
slice
38193819
);
@@ -3829,7 +3829,7 @@ namespace FabricSplice
38293829
bool setRTVal(FabricCore::RTVal value, uint32_t slice = 0)
38303830
{
38313831
return setRTVal_lockType(
3832-
FabricCore::LockType_Context,
3832+
FabricCore::LockType_Shared,
38333833
value,
38343834
slice
38353835
);
@@ -3899,7 +3899,7 @@ namespace FabricSplice
38993899
)
39003900
{
39013901
return getArrayData_lockType(
3902-
FabricCore::LockType_Context,
3902+
FabricCore::LockType_Shared,
39033903
buffer,
39043904
bufferSize,
39053905
slice
@@ -3918,7 +3918,7 @@ namespace FabricSplice
39183918
bool setArrayData(void * buffer, unsigned int bufferSize, unsigned int slice = 0)
39193919
{
39203920
return setArrayData_lockType(
3921-
FabricCore::LockType_Context,
3921+
FabricCore::LockType_Shared,
39223922
buffer,
39233923
bufferSize,
39243924
slice

0 commit comments

Comments
 (0)