-
Notifications
You must be signed in to change notification settings - Fork 156
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement the delay queue for exited thread (#365)
Signed-off-by: yaofighting <siyao@zju.edu.cn>
- Loading branch information
1 parent
d4e2652
commit d4e8e64
Showing
4 changed files
with
199 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 84 additions & 0 deletions
84
collector/pkg/component/analyzer/cpuanalyzer/delete_tid.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| package cpuanalyzer | ||
|
|
||
| import ( | ||
| "sync" | ||
| "time" | ||
| ) | ||
|
|
||
| type tidDeleteQueue struct { | ||
| queueMutex sync.Mutex | ||
| queue []deleteTid | ||
| } | ||
|
|
||
| type deleteTid struct { | ||
| pid uint32 | ||
| tid uint32 | ||
| exitTime time.Time | ||
| } | ||
|
|
||
| func newTidDeleteQueue() *tidDeleteQueue { | ||
| return &tidDeleteQueue{queue: make([]deleteTid, 0)} | ||
| } | ||
|
|
||
| func (dq *tidDeleteQueue) GetFront() *deleteTid { | ||
| if len(dq.queue) > 0 { | ||
| return &dq.queue[0] | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (dq *tidDeleteQueue) Push(elem deleteTid) { | ||
| dq.queue = append(dq.queue, elem) | ||
| } | ||
|
|
||
| func (dq *tidDeleteQueue) Pop() { | ||
| if len(dq.queue) > 0 { | ||
| dq.queue = dq.queue[1:len(dq.queue)] | ||
| } | ||
| } | ||
|
|
||
| //Add procexit tid | ||
| func (ca *CpuAnalyzer) AddTidToDeleteCache(curTime time.Time, pid uint32, tid uint32) { | ||
| cacheElem := deleteTid{pid: pid, tid: tid, exitTime: curTime} | ||
| ca.tidExpiredQueue.queueMutex.Lock() | ||
| defer ca.tidExpiredQueue.queueMutex.Unlock() | ||
| ca.tidExpiredQueue.Push(cacheElem) | ||
| } | ||
|
|
||
| func (ca *CpuAnalyzer) DeleteTid(tidEventsMap map[uint32]*TimeSegments, tid uint32) { | ||
| ca.lock.Lock() | ||
| defer ca.lock.Unlock() | ||
| delete(tidEventsMap, tid) | ||
| } | ||
|
|
||
| func (ca *CpuAnalyzer) TidDelete(interval time.Duration, expiredDuration time.Duration) { | ||
| for { | ||
| select { | ||
| case <-time.After(interval): | ||
| now := time.Now() | ||
| func() { | ||
| ca.tidExpiredQueue.queueMutex.Lock() | ||
| defer ca.tidExpiredQueue.queueMutex.Unlock() | ||
| for { | ||
| elem := ca.tidExpiredQueue.GetFront() | ||
| if elem == nil { | ||
| break | ||
| } | ||
| if elem.exitTime.Add(expiredDuration).Before(now) { | ||
| tidEventsMap := ca.cpuPidEvents[elem.pid] | ||
| if tidEventsMap == nil { | ||
| ca.tidExpiredQueue.Pop() | ||
| continue | ||
| } | ||
| ca.telemetry.Logger.Debugf("Delete expired thread... pid=%d, tid=%d", elem.pid, elem.tid) | ||
| //fmt.Printf("Go Test: Delete expired thread... pid=%d, tid=%d\n", elem.pid, elem.tid) | ||
| ca.DeleteTid(tidEventsMap, elem.tid) | ||
| ca.tidExpiredQueue.Pop() | ||
| } else { | ||
| break | ||
| } | ||
| } | ||
| }() | ||
| } | ||
| } | ||
| } |
107 changes: 107 additions & 0 deletions
107
collector/pkg/component/analyzer/cpuanalyzer/delete_tid_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| package cpuanalyzer | ||
|
|
||
| import ( | ||
| "strconv" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/Kindling-project/kindling/collector/pkg/component" | ||
| ) | ||
|
|
||
| var ( | ||
| visit []deleteTid | ||
| ca *CpuAnalyzer | ||
| exitTid map[uint32]int | ||
| enterCnt int | ||
| exitCnt int | ||
| ) | ||
|
|
||
| const timeDuration time.Duration = 100 * time.Millisecond | ||
|
|
||
| func TestDeleteQueue(t *testing.T) { | ||
|
|
||
| cpupidEvents := make(map[uint32]map[uint32]*TimeSegments, 100000) | ||
| testTelemetry := component.NewTelemetryManager().GetGlobalTelemetryTools() | ||
| mycfg := &Config{SegmentSize: 40} | ||
| ca = &CpuAnalyzer{cpuPidEvents: cpupidEvents, telemetry: testTelemetry, cfg: mycfg} | ||
|
|
||
| ca.tidExpiredQueue = newTidDeleteQueue() | ||
|
|
||
| visit = make([]deleteTid, 0) | ||
| exitTid = make(map[uint32]int, 0) | ||
|
|
||
| go ca.TidDelete(5*timeDuration, 4*timeDuration) | ||
| go CheckQueueLoop(t) | ||
| for i := 0; i < 20; i++ { | ||
|
|
||
| ev := new(CpuEvent) | ||
| curTime := time.Now() | ||
| ev.EndTime = uint64(curTime.Add(timeDuration).Nanosecond()) | ||
| ev.StartTime = uint64(curTime.Nanosecond()) | ||
|
|
||
| //check tid which exist in queue but not in the map | ||
| if i%4 != 0 { | ||
| ca.PutEventToSegments(uint32(i), uint32(i)+5, "threadname"+strconv.Itoa(i+100), ev) | ||
| } | ||
|
|
||
| var queueLen int | ||
|
|
||
| func() { | ||
| ca.tidExpiredQueue.queueMutex.Lock() | ||
| defer ca.tidExpiredQueue.queueMutex.Unlock() | ||
| queueLen = len(ca.tidExpiredQueue.queue) | ||
|
|
||
| cacheElem := deleteTid{uint32(i), uint32(i) + 5, curTime.Add(timeDuration)} | ||
| ca.tidExpiredQueue.Push(cacheElem) | ||
| visit = append(visit, cacheElem) | ||
| if len(ca.tidExpiredQueue.queue) != queueLen+1 { | ||
| t.Errorf("the length of queue is not added, expection: %d but: %d\n", queueLen+1, len(ca.tidExpiredQueue.queue)) | ||
| } | ||
| }() | ||
|
|
||
| t.Logf("pid=%d, tid=%d enter time=%s\n", uint32(i), uint32(i)+5, curTime.Format("2006-01-02 15:04:05.000")) | ||
| enterCnt++ | ||
| time.Sleep(3 * timeDuration) | ||
| } | ||
| time.Sleep(10 * timeDuration) | ||
|
|
||
| if enterCnt != exitCnt { | ||
| t.Fatalf("The number of threads that entering and exiting the queue is not equal! enterCount=%d, exitCount=%d\n", enterCnt, exitCnt) | ||
| } else { | ||
| t.Logf("All threads have exited normally. enterCount=%d, exitCount=%d\n", enterCnt, exitCnt) | ||
| } | ||
|
|
||
| } | ||
|
|
||
| func CheckQueueLoop(t *testing.T) { | ||
| for { | ||
| select { | ||
| case <-time.After(timeDuration * 3): | ||
| func() { | ||
| ca.tidExpiredQueue.queueMutex.Lock() | ||
| defer ca.tidExpiredQueue.queueMutex.Unlock() | ||
| queueLen := len(ca.tidExpiredQueue.queue) | ||
| curTime := time.Now() | ||
| for i := 0; i < len(visit); i++ { | ||
| tmpv := visit[i] | ||
| var j int | ||
| for j = 0; j < queueLen; j++ { | ||
| tmpq := ca.tidExpiredQueue.queue[j] | ||
| if tmpv.tid == tmpq.tid { | ||
| if curTime.After(tmpq.exitTime.Add(12 * timeDuration)) { | ||
| t.Errorf("there is a expired threads that is not deleted. pid=%d, tid=%d, exitTime=%s\n", tmpv.pid, tmpv.tid, tmpv.exitTime.Format("2006-01-02 15:04:05.000")) | ||
| } | ||
| break | ||
| } | ||
| } | ||
|
|
||
| if _, exist := exitTid[tmpv.tid]; j >= queueLen && !exist { | ||
| exitTid[tmpv.tid] = 1 | ||
| exitCnt++ | ||
| t.Logf("pid=%d, tid=%d exit time=%s\n", tmpv.pid, tmpv.tid, curTime.Format("2006-01-02 15:04:05.000")) | ||
| } | ||
| } | ||
| }() | ||
| } | ||
| } | ||
| } |