Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_40195168达庆意
TDengine
提交
bd12ad6a
TDengine
项目概览
weixin_40195168达庆意
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
bd12ad6a
编写于
2月 03, 2021
作者:
S
Shengliang Guan
提交者:
GitHub
2月 03, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #5076 from freemine/mac
taosIterateRef: shall NOT return removed node
上级
aefc6052
c3f83154
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
92 addition
and
75 deletion
+92
-75
src/util/src/tref.c
src/util/src/tref.c
+92
-75
未找到文件。
src/util/src/tref.c
浏览文件 @
bd12ad6a
...
...
@@ -24,22 +24,22 @@
#define TSDB_REF_STATE_DELETED 2
typedef
struct
SRefNode
{
struct
SRefNode
*
prev
;
// previous node
struct
SRefNode
*
prev
;
// previous node
struct
SRefNode
*
next
;
// next node
void
*
p
;
// pointer to resource protected,
void
*
p
;
// pointer to resource protected,
int64_t
rid
;
// reference ID
int32_t
count
;
// number of references
int
removed
;
// 1: removed
int
removed
;
// 1: removed
}
SRefNode
;
typedef
struct
{
SRefNode
**
nodeList
;
// array of SRefNode linked list
int
state
;
// 0: empty, 1: active; 2: deleted
int
rsetId
;
// refSet ID, global unique
int
rsetId
;
// refSet ID, global unique
int64_t
rid
;
// increase by one for each new reference
int
max
;
// mod
int
max
;
// mod
int32_t
count
;
// total number of SRefNodes in this set
int64_t
*
lockedBy
;
int64_t
*
lockedBy
;
void
(
*
fp
)(
void
*
);
}
SRefSet
;
...
...
@@ -62,9 +62,9 @@ int taosOpenRef(int max, void (*fp)(void *))
SRefSet
*
pSet
;
int64_t
*
lockedBy
;
int
i
,
rsetId
;
pthread_once
(
&
tsRefModuleInit
,
taosInitRefModule
);
nodeList
=
calloc
(
sizeof
(
SRefNode
*
),
(
size_t
)
max
);
if
(
nodeList
==
NULL
)
{
terrno
=
TSDB_CODE_REF_NO_MEMORY
;
...
...
@@ -79,12 +79,12 @@ int taosOpenRef(int max, void (*fp)(void *))
}
pthread_mutex_lock
(
&
tsRefMutex
);
for
(
i
=
0
;
i
<
TSDB_REF_OBJECTS
;
++
i
)
{
tsNextId
=
(
tsNextId
+
1
)
%
TSDB_REF_OBJECTS
;
if
(
tsNextId
==
0
)
tsNextId
=
1
;
// dont use 0 as rsetId
if
(
tsRefSetList
[
tsNextId
].
state
==
TSDB_REF_STATE_EMPTY
)
break
;
}
}
if
(
i
<
TSDB_REF_OBJECTS
)
{
rsetId
=
tsNextId
;
...
...
@@ -105,7 +105,7 @@ int taosOpenRef(int max, void (*fp)(void *))
free
(
nodeList
);
free
(
lockedBy
);
uTrace
(
"run out of Ref ID, maximum:%d refSetNum:%d"
,
TSDB_REF_OBJECTS
,
tsRefSetNum
);
}
}
pthread_mutex_unlock
(
&
tsRefMutex
);
...
...
@@ -127,7 +127,7 @@ int taosCloseRef(int rsetId)
pthread_mutex_lock
(
&
tsRefMutex
);
if
(
pSet
->
state
==
TSDB_REF_STATE_ACTIVE
)
{
if
(
pSet
->
state
==
TSDB_REF_STATE_ACTIVE
)
{
pSet
->
state
=
TSDB_REF_STATE_DELETED
;
deleted
=
1
;
uTrace
(
"rsetId:%d is closed, count:%d"
,
rsetId
,
pSet
->
count
);
...
...
@@ -142,7 +142,7 @@ int taosCloseRef(int rsetId)
return
0
;
}
int64_t
taosAddRef
(
int
rsetId
,
void
*
p
)
int64_t
taosAddRef
(
int
rsetId
,
void
*
p
)
{
int
hash
;
SRefNode
*
pNode
;
...
...
@@ -163,7 +163,7 @@ int64_t taosAddRef(int rsetId, void *p)
terrno
=
TSDB_CODE_REF_ID_REMOVED
;
return
-
1
;
}
pNode
=
calloc
(
sizeof
(
SRefNode
),
1
);
if
(
pNode
==
NULL
)
{
terrno
=
TSDB_CODE_REF_NO_MEMORY
;
...
...
@@ -173,7 +173,7 @@ int64_t taosAddRef(int rsetId, void *p)
rid
=
atomic_add_fetch_64
(
&
pSet
->
rid
,
1
);
hash
=
rid
%
pSet
->
max
;
taosLockList
(
pSet
->
lockedBy
+
hash
);
pNode
->
p
=
p
;
pNode
->
rid
=
rid
;
pNode
->
count
=
1
;
...
...
@@ -187,16 +187,16 @@ int64_t taosAddRef(int rsetId, void *p)
taosUnlockList
(
pSet
->
lockedBy
+
hash
);
return
rid
;
return
rid
;
}
int
taosRemoveRef
(
int
rsetId
,
int64_t
rid
)
int
taosRemoveRef
(
int
rsetId
,
int64_t
rid
)
{
return
taosDecRefCount
(
rsetId
,
rid
,
1
);
}
// if rid is 0, return the first p in hash list, otherwise, return the next after current rid
void
*
taosAcquireRef
(
int
rsetId
,
int64_t
rid
)
void
*
taosAcquireRef
(
int
rsetId
,
int64_t
rid
)
{
int
hash
;
SRefNode
*
pNode
;
...
...
@@ -223,7 +223,7 @@ void *taosAcquireRef(int rsetId, int64_t rid)
terrno
=
TSDB_CODE_REF_ID_REMOVED
;
return
NULL
;
}
hash
=
rid
%
pSet
->
max
;
taosLockList
(
pSet
->
lockedBy
+
hash
);
...
...
@@ -233,8 +233,8 @@ void *taosAcquireRef(int rsetId, int64_t rid)
if
(
pNode
->
rid
==
rid
)
{
break
;
}
pNode
=
pNode
->
next
;
pNode
=
pNode
->
next
;
}
if
(
pNode
)
{
...
...
@@ -258,7 +258,7 @@ void *taosAcquireRef(int rsetId, int64_t rid)
return
p
;
}
int
taosReleaseRef
(
int
rsetId
,
int64_t
rid
)
int
taosReleaseRef
(
int
rsetId
,
int64_t
rid
)
{
return
taosDecRefCount
(
rsetId
,
rid
,
0
);
}
...
...
@@ -280,6 +280,7 @@ void *taosIterateRef(int rsetId, int64_t rid) {
return
NULL
;
}
void
*
newP
=
NULL
;
pSet
=
tsRefSetList
+
rsetId
;
taosIncRsetCount
(
pSet
);
if
(
pSet
->
state
!=
TSDB_REF_STATE_ACTIVE
)
{
...
...
@@ -289,52 +290,68 @@ void *taosIterateRef(int rsetId, int64_t rid) {
return
NULL
;
}
int
hash
=
0
;
if
(
rid
>
0
)
{
hash
=
rid
%
pSet
->
max
;
taosLockList
(
pSet
->
lockedBy
+
hash
);
do
{
newP
=
NULL
;
int
hash
=
0
;
if
(
rid
>
0
)
{
hash
=
rid
%
pSet
->
max
;
taosLockList
(
pSet
->
lockedBy
+
hash
);
pNode
=
pSet
->
nodeList
[
hash
];
while
(
pNode
)
{
if
(
pNode
->
rid
==
rid
)
break
;
pNode
=
pNode
->
next
;
}
pNode
=
pSet
->
nodeList
[
hash
];
while
(
pNode
)
{
if
(
pNode
->
rid
==
rid
)
break
;
pNode
=
pNode
->
next
;
}
if
(
pNode
==
NULL
)
{
uError
(
"rsetId:%d rid:%"
PRId64
" not there, quit"
,
rsetId
,
rid
);
terrno
=
TSDB_CODE_REF_NOT_EXIST
;
taosUnlockList
(
pSet
->
lockedBy
+
hash
);
taosDecRsetCount
(
pSet
);
return
NULL
;
}
if
(
pNode
==
NULL
)
{
uError
(
"rsetId:%d rid:%"
PRId64
" not there, quit"
,
rsetId
,
rid
);
terrno
=
TSDB_CODE_REF_NOT_EXIST
;
taosUnlockList
(
pSet
->
lockedBy
+
hash
);
return
NULL
;
// rid is there
pNode
=
pNode
->
next
;
// check first place
while
(
pNode
)
{
if
(
!
pNode
->
removed
)
break
;
pNode
=
pNode
->
next
;
}
if
(
pNode
==
NULL
)
{
taosUnlockList
(
pSet
->
lockedBy
+
hash
);
hash
++
;
}
}
// rid is there
pNode
=
pNode
->
next
;
if
(
pNode
==
NULL
)
{
taosUnlockList
(
pSet
->
lockedBy
+
hash
);
hash
++
;
if
(
pNode
==
NULL
)
{
for
(;
hash
<
pSet
->
max
;
++
hash
)
{
taosLockList
(
pSet
->
lockedBy
+
hash
);
pNode
=
pSet
->
nodeList
[
hash
];
if
(
pNode
)
{
// check first place
while
(
pNode
)
{
if
(
!
pNode
->
removed
)
break
;
pNode
=
pNode
->
next
;
}
if
(
pNode
)
break
;
}
taosUnlockList
(
pSet
->
lockedBy
+
hash
);
}
}
}
if
(
pNode
==
NULL
)
{
for
(;
hash
<
pSet
->
max
;
++
hash
)
{
taosLockList
(
pSet
->
lockedBy
+
hash
);
pNode
=
pSet
->
nodeList
[
hash
];
if
(
pNode
)
break
;
if
(
pNode
)
{
pNode
->
count
++
;
// acquire it
newP
=
pNode
->
p
;
taosUnlockList
(
pSet
->
lockedBy
+
hash
);
uTrace
(
"rsetId:%d p:%p rid:%"
PRId64
" is returned"
,
rsetId
,
newP
,
rid
);
}
else
{
uTrace
(
"rsetId:%d the list is over"
,
rsetId
);
}
}
void
*
newP
=
NULL
;
if
(
pNode
)
{
pNode
->
count
++
;
// acquire it
newP
=
pNode
->
p
;
taosUnlockList
(
pSet
->
lockedBy
+
hash
);
uTrace
(
"rsetId:%d p:%p rid:%"
PRId64
" is returned"
,
rsetId
,
newP
,
rid
);
}
else
{
uTrace
(
"rsetId:%d the list is over"
,
rsetId
);
}
if
(
rid
>
0
)
taosReleaseRef
(
rsetId
,
rid
);
// release the current one
if
(
rid
>
0
)
taosReleaseRef
(
rsetId
,
rid
);
// release the current one
if
(
pNode
)
rid
=
pNode
->
rid
;
}
while
(
newP
&&
pNode
->
removed
);
taosDecRsetCount
(
pSet
);
...
...
@@ -350,22 +367,22 @@ int taosListRef() {
for
(
int
i
=
0
;
i
<
TSDB_REF_OBJECTS
;
++
i
)
{
pSet
=
tsRefSetList
+
i
;
if
(
pSet
->
state
==
TSDB_REF_STATE_EMPTY
)
if
(
pSet
->
state
==
TSDB_REF_STATE_EMPTY
)
continue
;
uInfo
(
"rsetId:%d state:%d count::%d"
,
i
,
pSet
->
state
,
pSet
->
count
);
for
(
int
j
=
0
;
j
<
pSet
->
max
;
++
j
)
{
pNode
=
pSet
->
nodeList
[
j
];
while
(
pNode
)
{
uInfo
(
"rsetId:%d p:%p rid:%"
PRId64
"count:%d"
,
i
,
pNode
->
p
,
pNode
->
rid
,
pNode
->
count
);
pNode
=
pNode
->
next
;
num
++
;
}
}
}
}
}
pthread_mutex_unlock
(
&
tsRefMutex
);
...
...
@@ -397,16 +414,16 @@ static int taosDecRefCount(int rsetId, int64_t rid, int remove) {
terrno
=
TSDB_CODE_REF_ID_REMOVED
;
return
-
1
;
}
hash
=
rid
%
pSet
->
max
;
taosLockList
(
pSet
->
lockedBy
+
hash
);
pNode
=
pSet
->
nodeList
[
hash
];
while
(
pNode
)
{
if
(
pNode
->
rid
==
rid
)
break
;
pNode
=
pNode
->
next
;
pNode
=
pNode
->
next
;
}
if
(
pNode
)
{
...
...
@@ -417,18 +434,18 @@ static int taosDecRefCount(int rsetId, int64_t rid, int remove) {
if
(
pNode
->
prev
)
{
pNode
->
prev
->
next
=
pNode
->
next
;
}
else
{
pSet
->
nodeList
[
hash
]
=
pNode
->
next
;
pSet
->
nodeList
[
hash
]
=
pNode
->
next
;
}
if
(
pNode
->
next
)
{
pNode
->
next
->
prev
=
pNode
->
prev
;
}
pNode
->
next
->
prev
=
pNode
->
prev
;
}
released
=
1
;
}
else
{
uTrace
(
"rsetId:%d p:%p rid:%"
PRId64
" is released"
,
rsetId
,
pNode
->
p
,
rid
);
uTrace
(
"rsetId:%d p:%p rid:%"
PRId64
" is released"
,
rsetId
,
pNode
->
p
,
rid
);
}
}
else
{
uTrace
(
"rsetId:%d rid:%"
PRId64
" is not there, failed to release/remove"
,
rsetId
,
rid
);
uTrace
(
"rsetId:%d rid:%"
PRId64
" is not there, failed to release/remove"
,
rsetId
,
rid
);
terrno
=
TSDB_CODE_REF_NOT_EXIST
;
code
=
-
1
;
}
...
...
@@ -437,11 +454,11 @@ static int taosDecRefCount(int rsetId, int64_t rid, int remove) {
if
(
released
)
{
uTrace
(
"rsetId:%d p:%p rid:%"
PRId64
" is removed, count:%d, free mem: %p"
,
rsetId
,
pNode
->
p
,
rid
,
pSet
->
count
,
pNode
);
(
*
pSet
->
fp
)(
pNode
->
p
);
(
*
pSet
->
fp
)(
pNode
->
p
);
free
(
pNode
);
taosDecRsetCount
(
pSet
);
}
}
return
code
;
}
...
...
@@ -493,5 +510,5 @@ static void taosDecRsetCount(SRefSet *pSet) {
}
pthread_mutex_unlock
(
&
tsRefMutex
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录