hesoyam/sing-box-extended-mirror
1
0
Fork 0
mirror of https://github.com/shtorm-7/sing-box-extended.git synced 2026-10-14 01:54:00 +00:00
Code Issues Packages Projects Releases 2 Wiki Activity

Record platform network path in power report

Browse Source
This commit is contained in:
世界
2026-09-01 21:43:43 +08:00
parent b807ff30d0
commit 6c4589c933
4 changed files with 67 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
experimental/libbox/monitor.go
+12
View File
@@ -56,6 +56,18 @@ func (m *platformDefaultInterfaceMonitor) UnregisterCallback(element *list.Eleme
m.callbacks.Remove(element)
}
func (m *platformDefaultInterfaceMonitor) UpdateNetworkPath(networkPath string) {
m.logger.Debug("updated network path: ", networkPath)
if m.powerManager == nil {
return
}
recorder := m.powerManager.Recorder()
if recorder == nil {
return
}
recorder.UpdateNetworkPath(networkPath)
}
func (m *platformDefaultInterfaceMonitor) UpdateDefaultInterface(interfaceName string, interfaceIndex32 int32, isExpensive bool, isConstrained bool) {
if sFixAndroidStack {
done := make(chan struct{})
experimental/libbox/platform.go
+1
View File
@@ -89,6 +89,7 @@ func (c *ConnectionOwner) AndroidPackageNames() StringIterator {
type InterfaceUpdateListener interface {
UpdateDefaultInterface(interfaceName string, interfaceIndex int32, isExpensive bool, isConstrained bool)
UpdateNetworkPath(networkPath string)
}
const (
service/powerreport/record.go
+3
View File
@@ -65,6 +65,7 @@ type timelineRow struct {
ConnectionsOpened uint64 `json:"connectionsOpened,omitempty"`
InterfacePackets map[string]uint64 `json:"interfacePackets,omitempty"`
NetworkType string `json:"network,omitempty"`
NetworkPathUpdates uint64 `json:"pathUpdates,omitempty"`
}
type qosBreakdown struct {
@@ -80,6 +81,7 @@ type qosBreakdown struct {
const (
eventTypeBreak = "break"
eventTypeNetwork = "network"
eventTypePath = "path"
)
type eventRecord struct {
@@ -89,6 +91,7 @@ type eventRecord struct {
Direction string `json:"direction,omitempty"`
Size int `json:"size,omitempty"`
NetworkType string `json:"network,omitempty"`
NetworkPath string `json:"path,omitempty"`
By *Attribution `json:"by,omitempty"`
}
service/powerreport/recorder.go
+51 -28
View File
@@ -70,11 +70,13 @@ type Recorder struct {
pendingBreak atomic.Pointer[breakRecord]
notify chan struct{}
dnsQueries atomic.Uint64
connectionsOpened atomic.Uint64
dnsQueries atomic.Uint64
connectionsOpened atomic.Uint64
networkPathUpdates atomic.Uint64
access sync.Mutex
networkType string
networkPath string
rows []timelineRow
events []eventRecord
previous previousSample
@@ -96,15 +98,16 @@ type breakRecord struct {
}
type previousSample struct {
at time.Time
usage systemUsage
gcSeconds float64
gcCycles uint64
absoluteTime int64
continuousTime int64
interfaces map[string]interfaceCounters
dnsQueries uint64
connectionsOpened uint64
at time.Time
usage systemUsage
gcSeconds float64
gcCycles uint64
absoluteTime int64
continuousTime int64
interfaces map[string]interfaceCounters
dnsQueries uint64
connectionsOpened uint64
networkPathUpdates uint64
}
func NewRecorder(options Options) *Recorder {
@@ -285,6 +288,24 @@ func (r *Recorder) UpdateNetworkType(networkType string) {
r.notifyWorker()
}
func (r *Recorder) UpdateNetworkPath(description string) {
r.networkPathUpdates.Add(1)
now := time.Now()
r.access.Lock()
if r.closed || r.networkPath == description {
r.access.Unlock()
return
}
r.networkPath = description
r.events = append(r.events, eventRecord{
Type: eventTypePath,
At: now.UTC().Format(time.RFC3339),
NetworkPath: description,
})
r.access.Unlock()
r.notifyWorker()
}
func (r *Recorder) notifyWorker() {
select {
case r.notify <- struct{}{}:
@@ -345,13 +366,14 @@ func (r *Recorder) consumeBreakLocked() {
func (r *Recorder) resetPreviousLocked(now time.Time) {
metrics.Read(r.metricsSamples)
r.previous = previousSample{
at: now,
usage: readSystemUsage(),
gcSeconds: r.metricsSamples[0].Value.Float64(),
gcCycles: r.metricsSamples[2].Value.Uint64(),
interfaces: readInterfaceCounters(),
dnsQueries: r.dnsQueries.Load(),
connectionsOpened: r.connectionsOpened.Load(),
at: now,
usage: readSystemUsage(),
gcSeconds: r.metricsSamples[0].Value.Float64(),
gcCycles: r.metricsSamples[2].Value.Uint64(),
interfaces: readInterfaceCounters(),
dnsQueries: r.dnsQueries.Load(),
connectionsOpened: r.connectionsOpened.Load(),
networkPathUpdates: r.networkPathUpdates.Load(),
}
r.previous.absoluteTime, r.previous.continuousTime = readClocks()
}
@@ -361,16 +383,17 @@ func (r *Recorder) sampleLocked(now time.Time) {
r.resetPreviousLocked(now)
current := &r.previous
row := timelineRow{
From: previous.at.UTC().Format(time.RFC3339),
To: now.UTC().Format(time.RFC3339),
CPUGCMS: int64((current.gcSeconds - previous.gcSeconds) * 1000),
Goroutines: r.metricsSamples[1].Value.Uint64(),
GCCycles: current.gcCycles - previous.gcCycles,
GoMemoryBytes: r.metricsSamples[3].Value.Uint64(),
GoHeapLiveBytes: r.metricsSamples[4].Value.Uint64(),
DNSQueries: current.dnsQueries - previous.dnsQueries,
ConnectionsOpened: current.connectionsOpened - previous.connectionsOpened,
NetworkType: r.networkType,
From: previous.at.UTC().Format(time.RFC3339),
To: now.UTC().Format(time.RFC3339),
CPUGCMS: int64((current.gcSeconds - previous.gcSeconds) * 1000),
Goroutines: r.metricsSamples[1].Value.Uint64(),
GCCycles: current.gcCycles - previous.gcCycles,
GoMemoryBytes: r.metricsSamples[3].Value.Uint64(),
GoHeapLiveBytes: r.metricsSamples[4].Value.Uint64(),
DNSQueries: current.dnsQueries - previous.dnsQueries,
ConnectionsOpened: current.connectionsOpened - previous.connectionsOpened,
NetworkType: r.networkType,
NetworkPathUpdates: current.networkPathUpdates - previous.networkPathUpdates,
}
if memory.TotalAvailable() {
row.MemoryBytes = memory.Total()