std: switch mgmt/nfd/status to time

named-data · Jan 3, 2025 · 8ee8188 · 8ee8188
1 parent b198a0a
commit 8ee8188
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 31 deletions.
diff --git a/fw/mgmt/forwarder-status.go b/fw/mgmt/forwarder-status.go
@@ -66,8 +66,8 @@ func (f *ForwarderStatusModule) general(interest *spec.Interest, pitToken []byte
 	// Generate new dataset
 	status := &mgmt.GeneralStatus{
 		NfdVersion:       core.Version,
-		StartTimestamp:   uint64(core.StartTimestamp.UnixNano() / 1000 / 1000),
-		CurrentTimestamp: uint64(time.Now().UnixNano() / 1000 / 1000),
+		StartTimestamp:   time.Duration(core.StartTimestamp.UnixNano()),
+		CurrentTimestamp: time.Duration(time.Now().UnixNano()),
 		NFibEntries:      uint64(len(table.FibStrategyTable.GetAllFIBEntries())),
 	}
 	// Don't set NNameTreeEntries because we don't use a NameTree

diff --git a/std/ndn/mgmt_2022/definitions.go b/std/ndn/mgmt_2022/definitions.go
@@ -2,6 +2,8 @@
 package mgmt_2022
 
 import (
+	"time"
+
 	enc "github.com/named-data/ndnd/std/encoding"
 )
 
@@ -139,10 +141,10 @@ type FaceEventNotification struct {
 type GeneralStatus struct {
 	//+field:string
 	NfdVersion string `tlv:"0x80"`
-	//+field:natural
-	StartTimestamp uint64 `tlv:"0x81"`
-	//+field:natural
-	CurrentTimestamp uint64 `tlv:"0x82"`
+	//+field:time
+	StartTimestamp time.Duration `tlv:"0x81"`
+	//+field:time
+	CurrentTimestamp time.Duration `tlv:"0x82"`
 	//+field:natural
 	NNameTreeEntries uint64 `tlv:"0x83"`
 	//+field:natural

diff --git a/std/ndn/mgmt_2022/zz_generated.go b/std/ndn/mgmt_2022/zz_generated.go
diff --git a/tools/nfdc/nfdc_status.go b/tools/nfdc/nfdc_status.go
@@ -31,9 +31,9 @@ func (n *Nfdc) ExecStatusGeneral(args []string) {
 	fmt.Println("General NFD status:")
 	n.statusPadding = 24
 	n.printStatusLine("version", status.NfdVersion)
-	n.printStatusLine("startTime", time.UnixMilli(int64(status.StartTimestamp)))
-	n.printStatusLine("currentTime", time.UnixMilli(int64(status.CurrentTimestamp)))
-	n.printStatusLine("uptime", time.Duration(status.CurrentTimestamp-status.StartTimestamp)*time.Millisecond)
+	n.printStatusLine("startTime", time.Unix(0, int64(status.StartTimestamp)))
+	n.printStatusLine("currentTime", time.Unix(0, int64(status.CurrentTimestamp)))
+	n.printStatusLine("uptime", (status.CurrentTimestamp - status.StartTimestamp))
 	n.printStatusLine("nNameTreeEntries", status.NNameTreeEntries)
 	n.printStatusLine("nFibEntries", status.NFibEntries)
 	n.printStatusLine("nPitEntries", status.NCsEntries)