Skip to content

Commit 54e96a0

Browse files
roksroks
committed
- minor updates, mostly name capitalization
1 parent f728995 commit 54e96a0

File tree

12 files changed

+205
-205
lines changed

12 files changed

+205
-205
lines changed

‎glib-core/ds.h‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -451,19 +451,19 @@ class TVec{
451451
~TVec() {if ((ValT!=NULL) && (MxVals!=-1)) {delete[] ValT;}}
452452
explicit TVec(TSIn& SIn): MxVals(0), Vals(0), ValT(NULL), IsShM(false) {Load(SIn);}
453453
/// Constructs the vector from a shared memory input ##TVec::LoadShM
454-
void LoadShM(TShMIn& ShMin);
454+
void LoadShM(TShMIn& ShMIn);
455455
/// Constructs vector from shared memory input passing in functor to initialize elements
456456
template <typename TLoadShMElem>
457-
void LoadShM(TShMIn& ShMin, TLoadShMElem LoadFromShMFn) {
457+
void LoadShM(TShMIn& ShMIn, TLoadShMElem LoadFromShMFn) {
458458
if ((ValT!=NULL) && (MxVals!=-1)) {delete[] ValT;}
459-
ShMin.Load(MxVals);
460-
ShMin.Load(Vals);
459+
ShMIn.Load(MxVals);
460+
ShMIn.Load(Vals);
461461
if (MxVals == 0) {
462462
ValT = NULL;
463463
} else {
464464
ValT=new TVal[MxVals];
465465
for (TSizeTy ValN=0; ValN<Vals; ValN++) {
466-
LoadFromShMFn(ValT+ValN, ShMin);
466+
LoadFromShMFn(ValT+ValN, ShMIn);
467467
}
468468
}
469469
IsShM = false;
@@ -599,7 +599,7 @@ class TVec{
599599
TVal& GetVal(const TSizeTy& ValN){return operator[](ValN);}
600600
/// Sets the value of element at position \c ValN to \c Val.
601601
void SetVal(const TSizeTy& ValN, const TVal& Val){
602-
EAssertR(!(IsShM && (MxVals == -1)), "Cannot directly access shared memory");
602+
EAssertR(!(IsShM && (MxVals == -1)), "Cannot write to shared memory");
603603
AssertR((0<=ValN)&&(ValN<Vals), GetXOutOfBoundsErrMsg(ValN)); ValT[ValN] = Val;}
604604
/// Fills \c ValV with elements at positions <tt>BValN...EValN</tt>.
605605
void GetSubValV(const TSizeTy& BValN, const TSizeTy& EValN, TVec<TVal, TSizeTy>& ValV) const;
@@ -619,7 +619,7 @@ class TVec{
619619
void PutAll(const TVal& Val);
620620

621621
/// Swaps elements at positions \c ValN1 and \c ValN2.
622-
void Swap(const TSizeTy& ValN1, const TSizeTy& ValN2){EAssertR(!(IsShM && (MxVals == -1)), "Cannot directly access shared memory");
622+
void Swap(const TSizeTy& ValN1, const TSizeTy& ValN2){EAssertR(!(IsShM && (MxVals == -1)), "Cannot write to shared memory");
623623
const TVal Val=ValT[ValN1]; ValT[ValN1]=ValT[ValN2]; ValT[ValN2]=Val;}
624624
/// Swaps the elements that iterators \c LVal and \c RVal point to.
625625
static void SwapI(TIter LVal, TIter RVal){const TVal Val=*LVal; *LVal=*RVal; *RVal=Val;}
@@ -834,15 +834,15 @@ TVec<TVal, TSizeTy>::TVec(const TVec<TVal, TSizeTy>& Vec){
834834

835835

836836
template <class TVal, class TSizeTy>
837-
void TVec<TVal, TSizeTy>::LoadShM(TShMIn& ShMin) {
837+
void TVec<TVal, TSizeTy>::LoadShM(TShMIn& ShMIn) {
838838
if ((ValT!=NULL) && (MxVals!=-1)) {delete[] ValT;}
839-
ShMin.Load(MxVals);
839+
ShMIn.Load(MxVals);
840840
MxVals = -1;
841-
ShMin.Load(Vals);
841+
ShMIn.Load(Vals);
842842
if (MxVals == 0) {
843843
ValT = NULL;
844844
} else {
845-
ValT = (TVal*)(ShMin.AdvanceCursor(Vals*sizeof(TVal)));
845+
ValT = (TVal*)(ShMIn.AdvanceCursor(Vals*sizeof(TVal)));
846846
IsShM = true;
847847
}
848848
}
@@ -985,7 +985,7 @@ void TVec<TVal, TSizeTy>::MoveFrom(TVec<TVal, TSizeTy>& Vec){
985985

986986
template <class TVal, class TSizeTy>
987987
void TVec<TVal, TSizeTy>::CopyUniqueFrom(TVec<TVal, TSizeTy>& Vec, TInt Offset, TInt Sz){
988-
EAssertR(!(IsShM && (MxVals == -1)), "Cannot directly access shared memory");
988+
EAssertR(!(IsShM && (MxVals == -1)), "Cannot write to shared memory");
989989
if (this!=&Vec){
990990
if (ValT!=NULL && MxVals!=-1 && MxVals < Sz){
991991
delete[] ValT;
@@ -1020,7 +1020,7 @@ TSizeTy TVec<TVal, TSizeTy>::AddV(const TVec<TVal, TSizeTy>& ValV){
10201020

10211021
template <class TVal, class TSizeTy>
10221022
TSizeTy TVec<TVal, TSizeTy>::AddSorted(const TVal& Val, const bool& Asc, const TSizeTy& _MxVals){
1023-
EAssertR(!(IsShM && (MxVals == -1)), "Cannot directly access shared memory");
1023+
EAssertR(!(IsShM && (MxVals == -1)), "Cannot write to shared memory");
10241024
AssertR(MxVals!=-1, "This vector was obtained from TVecPool. Such vectors cannot change its size!");
10251025
TSizeTy ValN=Add(Val);
10261026
if (Asc){
@@ -1036,7 +1036,7 @@ TSizeTy TVec<TVal, TSizeTy>::AddSorted(const TVal& Val, const bool& Asc, const T
10361036

10371037
template <class TVal, class TSizeTy>
10381038
TSizeTy TVec<TVal, TSizeTy>::AddBackSorted(const TVal& Val, const bool& Asc){
1039-
EAssertR(!(IsShM && (MxVals == -1)), "Cannot directly access shared memory");
1039+
EAssertR(!(IsShM && (MxVals == -1)), "Cannot write to shared memory");
10401040
AssertR(MxVals!=-1, "This vector was obtained from TVecPool. Such vectors cannot change its size!");
10411041
Add();
10421042
TSizeTy ValN=Vals-2;
@@ -1048,7 +1048,7 @@ TSizeTy TVec<TVal, TSizeTy>::AddBackSorted(const TVal& Val, const bool& Asc){
10481048

10491049
template <class TVal, class TSizeTy>
10501050
TSizeTy TVec<TVal, TSizeTy>::AddMerged(const TVal& Val){
1051-
EAssertR(!(IsShM && (MxVals == -1)), "Cannot directly access shared memory");
1051+
EAssertR(!(IsShM && (MxVals == -1)), "Cannot write to shared memory");
10521052
AssertR(MxVals!=-1, "This vector was obtained from TVecPool. Such vectors cannot change its size!");
10531053
TSizeTy ValN=SearchBin(Val);
10541054
if (ValN==-1){return AddSorted(Val);}
@@ -1057,7 +1057,7 @@ TSizeTy TVec<TVal, TSizeTy>::AddMerged(const TVal& Val){
10571057

10581058
template <class TVal, class TSizeTy>
10591059
TSizeTy TVec<TVal, TSizeTy>::AddVMerged(const TVec<TVal, TSizeTy>& ValV){
1060-
EAssertR(!(IsShM && (MxVals == -1)), "Cannot directly access shared memory");
1060+
EAssertR(!(IsShM && (MxVals == -1)), "Cannot write to shared memory");
10611061
AssertR(MxVals!=-1, "This vector was obtained from TVecPool. Such vectors cannot change its size!");
10621062
for (TSizeTy ValN=0; ValN<ValV.Vals; ValN++){AddMerged(ValV[ValN]);}
10631063
return Len();
@@ -1083,7 +1083,7 @@ void TVec<TVal, TSizeTy>::GetSubValV(const TSizeTy& _BValN, const TSizeTy& _EVal
10831083

10841084
template <class TVal, class TSizeTy>
10851085
void TVec<TVal, TSizeTy>::Ins(const TSizeTy& ValN, const TVal& Val){
1086-
EAssertR(!(IsShM && (MxVals == -1)), "Cannot directly access shared memory");
1086+
EAssertR(!(IsShM && (MxVals == -1)), "Cannot write to shared memory");
10871087
AssertR(MxVals!=-1, "This vector was obtained from TVecPool. Such vectors cannot change its size!");
10881088
Add(); Assert((0<=ValN)&&(ValN<Vals));
10891089
for (TSizeTy MValN=Vals-2; MValN>=ValN; MValN--){ValT[MValN+1]=ValT[MValN];}
@@ -1092,7 +1092,7 @@ void TVec<TVal, TSizeTy>::Ins(const TSizeTy& ValN, const TVal& Val){
10921092

10931093
template <class TVal, class TSizeTy>
10941094
void TVec<TVal, TSizeTy>::Del(const TSizeTy& ValN){
1095-
EAssertR(!(IsShM && (MxVals == -1)), "Cannot directly access shared memory");
1095+
EAssertR(!(IsShM && (MxVals == -1)), "Cannot write to shared memory");
10961096
AssertR(MxVals!=-1, "This vector was obtained from TVecPool. Such vectors cannot change its size!");
10971097
Assert((0<=ValN)&&(ValN<Vals));
10981098
for (TSizeTy MValN=ValN+1; MValN<Vals; MValN++){
@@ -1102,7 +1102,7 @@ void TVec<TVal, TSizeTy>::Del(const TSizeTy& ValN){
11021102

11031103
template <class TVal, class TSizeTy>
11041104
void TVec<TVal, TSizeTy>::Del(const TSizeTy& MnValN, const TSizeTy& MxValN){
1105-
EAssertR(!(IsShM && (MxVals == -1)), "Cannot directly access shared memory");
1105+
EAssertR(!(IsShM && (MxVals == -1)), "Cannot write to shared memory");
11061106
AssertR(MxVals!=-1, "This vector was obtained from TVecPool. Such vectors cannot change its size!");
11071107
Assert((0<=MnValN)&&(MnValN<Vals)&&(0<=MxValN)&&(MxValN<Vals));
11081108
Assert(MnValN<=MxValN);
@@ -1115,7 +1115,7 @@ void TVec<TVal, TSizeTy>::Del(const TSizeTy& MnValN, const TSizeTy& MxValN){
11151115

11161116
template <class TVal, class TSizeTy>
11171117
bool TVec<TVal, TSizeTy>::DelIfIn(const TVal& Val){
1118-
EAssertR(!(IsShM && (MxVals == -1)), "Cannot directly access shared memory");
1118+
EAssertR(!(IsShM && (MxVals == -1)), "Cannot write to shared memory");
11191119
AssertR(MxVals!=-1, "This vector was obtained from TVecPool. Such vectors cannot change its size!");
11201120
TSizeTy ValN=SearchForw(Val);
11211121
if (ValN!=-1){Del(ValN); return true;}
@@ -1124,15 +1124,15 @@ bool TVec<TVal, TSizeTy>::DelIfIn(const TVal& Val){
11241124

11251125
template <class TVal, class TSizeTy>
11261126
void TVec<TVal, TSizeTy>::DelAll(const TVal& Val){
1127-
EAssertR(!(IsShM && (MxVals == -1)), "Cannot directly access shared memory");
1127+
EAssertR(!(IsShM && (MxVals == -1)), "Cannot write to shared memory");
11281128
AssertR(MxVals!=-1, "This vector was obtained from TVecPool. Such vectors cannot change its size!");
11291129
TSizeTy ValN;
11301130
while ((ValN=SearchForw(Val))!=-1){Del(ValN);}
11311131
}
11321132

11331133
template <class TVal, class TSizeTy>
11341134
void TVec<TVal, TSizeTy>::PutAll(const TVal& Val){
1135-
EAssertR(!(IsShM && (MxVals == -1)), "Cannot directly access shared memory");
1135+
EAssertR(!(IsShM && (MxVals == -1)), "Cannot write to shared memory");
11361136
for (TSizeTy ValN=0; ValN<Vals; ValN++){ValT[ValN]=Val;}
11371137
}
11381138

@@ -1259,7 +1259,7 @@ void TVec<TVal, TSizeTy>::Reverse(){
12591259

12601260
template <class TVal, class TSizeTy>
12611261
void TVec<TVal, TSizeTy>::Merge(){
1262-
IAssertR(!(IsShM && (MxVals == -1)), "Cannot directly access shared memory");
1262+
IAssertR(!(IsShM && (MxVals == -1)), "Cannot write to shared memory");
12631263
AssertR(MxVals!=-1, "This vector was obtained from TVecPool. Such vectors cannot change its size!");
12641264
TVec<TVal, TSizeTy> SortedVec(*this); SortedVec.Sort();
12651265
Clr();

‎glib-core/hash.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,27 +45,27 @@ TBigStrPool::TBigStrPool(TSIn& SIn, bool LoadCompact) : MxBfL(0), BfL(0), GrowBy
4545
}
4646
}
4747

48-
void TBigStrPool::LoadPoolShM(TShMIn& ShMin, bool LoadCompact) {
48+
void TBigStrPool::LoadPoolShM(TShMIn& ShMIn, bool LoadCompact) {
4949
uint64 Tmp;
50-
ShMin.Load(Tmp); IAssert(Tmp <= uint64(TSizeMx)); MxBfL=TSize(Tmp);
51-
ShMin.Load(Tmp); IAssert(Tmp <= uint64(TSizeMx)); BfL=TSize(Tmp);
52-
ShMin.Load(GrowBy); IAssert(MxBfL >= BfL); IAssert(BfL >= 0); IAssert(GrowBy >= 0);
50+
ShMIn.Load(Tmp); IAssert(Tmp <= uint64(TSizeMx)); MxBfL=TSize(Tmp);
51+
ShMIn.Load(Tmp); IAssert(Tmp <= uint64(TSizeMx)); BfL=TSize(Tmp);
52+
ShMIn.Load(GrowBy); IAssert(MxBfL >= BfL); IAssert(BfL >= 0); IAssert(GrowBy >= 0);
5353
IsShM = true;
5454
if (LoadCompact) {
5555
MxBfL = BfL;
56-
Bf = (char*)(ShMin.AdvanceCursor(BfL));
56+
Bf = (char*)(ShMIn.AdvanceCursor(BfL));
5757
IsShM = true;
5858
} else {
5959
if (MxBfL > 0) { Bf = (char *) malloc(MxBfL); IAssert(Bf); IsShM = false;}
60-
if (BfL > 0) { ShMin.LoadBf(Bf, BfL); }
60+
if (BfL > 0) { ShMIn.LoadBf(Bf, BfL); }
6161
IsShM = false;
6262
}
63-
ShMin.LoadCs();
63+
ShMIn.LoadCs();
6464
int NStr=0;
65-
ShMin.Load(NStr);
65+
ShMIn.Load(NStr);
6666
IdOffV.Gen(NStr, 0);
6767
for (int i = 0; i < NStr; i++) {
68-
ShMin.Load(Tmp);
68+
ShMIn.Load(Tmp);
6969
IAssert(Tmp <= uint64(TSizeMx));
7070
IdOffV.Add(TSize(Tmp));
7171
}

‎glib-core/hash.h‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ class THashKeyDat{
2424
void SaveXml(TSOut& SOut, const TStr& Nm) const;
2525

2626
template<typename TDatFunctor>
27-
void LoadShM(TShMIn& ShMin, TDatFunctor LoadDatFromShared) {
28-
Next = TInt(ShMin);
29-
HashCd = TInt(ShMin);
30-
TKey K(ShMin);
27+
void LoadShM(TShMIn& ShMIn, TDatFunctor LoadDatFromShared) {
28+
Next = TInt(ShMIn);
29+
HashCd = TInt(ShMIn);
30+
TKey K(ShMIn);
3131
Key = K;
32-
LoadDatFromShared(&Dat, ShMin);
32+
LoadDatFromShared(&Dat, ShMIn);
3333
}
3434
bool operator==(const THashKeyDat& HashKeyDat) const {
3535
if (this==&HashKeyDat || (HashCd==HashKeyDat.HashCd
@@ -129,7 +129,7 @@ class THash{
129129
TDatInitFn DatInitFn;
130130
public:
131131
TLoadTHKeyDatInitializer(TDatInitFn Fn) { DatInitFn = Fn;}
132-
void operator() (THKeyDat* HKeyDat, TShMIn& ShMin) { HKeyDat->LoadShM(ShMin, DatInitFn);}
132+
void operator() (THKeyDat* HKeyDat, TShMIn& ShMIn) { HKeyDat->LoadShM(ShMIn, DatInitFn);}
133133
};
134134

135135
private:
@@ -154,24 +154,24 @@ class THash{
154154
AutoSizeP(SIn), FFreeKeyId(SIn), FreeKeys(SIn){
155155
SIn.LoadCs();}
156156
/// Load THash from shared memory file. Copying/Deleting Keys is illegal
157-
void LoadShM(TShMIn& ShMin) {
158-
PortV.LoadShM(ShMin);
159-
KeyDatV.Load(ShMin);
160-
AutoSizeP=TBool(ShMin);
161-
FFreeKeyId=TInt(ShMin);
162-
FreeKeys=TInt(ShMin);
163-
ShMin.LoadCs();
157+
void LoadShM(TShMIn& ShMIn) {
158+
PortV.LoadShM(ShMIn);
159+
KeyDatV.Load(ShMIn);
160+
AutoSizeP=TBool(ShMIn);
161+
FFreeKeyId=TInt(ShMIn);
162+
FreeKeys=TInt(ShMIn);
163+
ShMIn.LoadCs();
164164
}
165165
/// Load THash from shared memory passing in the Dat initializer
166166
template <typename TDatInitFn>
167-
void LoadShM(TShMIn& ShMin, TDatInitFn Fn) {
167+
void LoadShM(TShMIn& ShMIn, TDatInitFn Fn) {
168168
TLoadTHKeyDatInitializer<TDatInitFn> HKeyDatFn(Fn);
169-
PortV.LoadShM(ShMin);
170-
KeyDatV.LoadShM(ShMin, HKeyDatFn);
171-
AutoSizeP=TBool(ShMin);
172-
FFreeKeyId=TInt(ShMin);
173-
FreeKeys=TInt(ShMin);
174-
ShMin.LoadCs();
169+
PortV.LoadShM(ShMIn);
170+
KeyDatV.LoadShM(ShMIn, HKeyDatFn);
171+
AutoSizeP=TBool(ShMIn);
172+
FFreeKeyId=TInt(ShMIn);
173+
FreeKeys=TInt(ShMIn);
174+
ShMIn.LoadCs();
175175
}
176176

177177
void Load(TSIn& SIn){
@@ -717,7 +717,7 @@ ClassTP(TBigStrPool, PBigStrPool)//{
717717
bool IsShM; //True if BigStrPool backed by shared memory
718718
private:
719719
void Resize(TSize _MxBfL);
720-
void LoadPoolShM(TShMIn& ShMin, bool LoadCompact = true);
720+
void LoadPoolShM(TShMIn& ShMIn, bool LoadCompact = true);
721721
public:
722722
TBigStrPool(TSize MxBfLen = 0, uint _GrowBy = 16*1024*1024);
723723
TBigStrPool(TSIn& SIn, bool LoadCompact = true);
@@ -730,9 +730,9 @@ ClassTP(TBigStrPool, PBigStrPool)//{
730730
static PBigStrPool New(const TStr& fileName) { PSIn SIn = TFIn::New(fileName); return new TBigStrPool(*SIn); }
731731
static PBigStrPool Load(TSIn& SIn, bool LoadCompacted = true) { return PBigStrPool(new TBigStrPool(SIn, LoadCompacted)); }
732732
/// Load the string pool with the buffer backed by shared memory
733-
static PBigStrPool LoadShM(TShMIn& ShMin, bool LoadCompact = true) {
733+
static PBigStrPool LoadShM(TShMIn& ShMIn, bool LoadCompact = true) {
734734
TBigStrPool* StrPool = new TBigStrPool();
735-
StrPool->LoadPoolShM(ShMin, LoadCompact);
735+
StrPool->LoadPoolShM(ShMIn, LoadCompact);
736736
return PBigStrPool(StrPool);
737737
}
738738
void Save(TSOut& SOut) const;
@@ -812,21 +812,21 @@ class TStrHash{
812812
FreeKeys.Load(SIn); SIn.LoadCs(); if (PoolToo) Pool = PStringPool(SIn);}
813813

814814
/// Load hash from shared memory. If shared pool is true load pool from shared memory
815-
void LoadShM(TShMIn& ShMin, bool SharedPool=true) {
816-
PortV.LoadShM(ShMin);
817-
KeyDatV.Load(ShMin);
818-
AutoSizeP.Load(ShMin);
819-
FFreeKeyId.Load(ShMin);
820-
FreeKeys.Load(ShMin);
821-
ShMin.LoadCs();
815+
void LoadShM(TShMIn& ShMIn, bool SharedPool=true) {
816+
PortV.LoadShM(ShMIn);
817+
KeyDatV.Load(ShMIn);
818+
AutoSizeP.Load(ShMIn);
819+
FFreeKeyId.Load(ShMIn);
820+
FreeKeys.Load(ShMIn);
821+
ShMIn.LoadCs();
822822
if (SharedPool) {
823823
TBool isNull;
824-
isNull.Load(ShMin);
824+
isNull.Load(ShMIn);
825825
if (!isNull) {
826-
Pool = TStringPool::LoadShM(ShMin);
826+
Pool = TStringPool::LoadShM(ShMIn);
827827
}
828828
} else {
829-
Pool = PStringPool(ShMin);
829+
Pool = PStringPool(ShMIn);
830830
}
831831
}
832832

0 commit comments

Comments
 (0)