Skip to content

Commit

Permalink
Merge pull request #32 from untangle/MFW-1751-Reduce-Dict-Stats-CPU
Browse files Browse the repository at this point in the history
Mfw 1751 reduce dict stats cpu
  • Loading branch information
jsommerville-untangle authored Dec 7, 2021
2 parents f09f08a + 7682e29 commit 80be653
Show file tree
Hide file tree
Showing 7 changed files with 76 additions and 59 deletions.
14 changes: 14 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "Compile protocol buffers",
"type": "shell",
"command": "./build.sh",
"group": {
"kind": "build",
"isDefault": true
}
}
]
}
6 changes: 3 additions & 3 deletions MODULES.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
git push
git push --tags
```
2. ### In the dependent package (ie: packetd, reportd, etc) use Go get with the -u flag will update to latest tag
2. ### In the dependent package (ie: packetd, reportd, etc) use Go get with the -u flag and include the version hash until the PR is approved
```
cd packetd
go get -u github.com/untangle/golang-shared
go get -u github.com/untangle/golang-shared@e5a6b85ad935713ac76d83ab5b2bf157069279a8
```
3. ### Verify the version in go.mod has been updated
Expand All @@ -38,6 +38,6 @@
```
2. ### Then we need to tidy and vendor again
```
go mod tidy
go mod vendor
go mod tidy
```
3 changes: 3 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

docker-compose -f build/docker-compose.build.yml up --build musl-local
12 changes: 6 additions & 6 deletions protobuffersrc/ActiveSessions.proto
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ message Session {
uint64 bytes = 3;
uint64 client_bytes = 4;
uint64 server_bytes = 5;
int64 byte_rate = 6;
int64 client_byte_rate = 7;
int64 server_byte_rate = 8;
uint32 byte_rate = 6;
uint32 client_byte_rate = 7;
uint32 server_byte_rate = 8;
uint64 packets = 9;
uint64 client_packets = 10;
uint64 server_packets = 11;
int64 packet_rate = 12;
int64 client_packet_rate = 13;
int64 server_packet_rate = 14;
uint32 packet_rate = 12;
uint32 client_packet_rate = 13;
uint32 server_packet_rate = 14;
string client_address = 15;
string client_address_new = 16;
uint32 client_interface_id = 17;
Expand Down
12 changes: 6 additions & 6 deletions protobuffersrc/SessionStatsEvent.proto
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ message SessionStatsEvent {
uint64 bytes = 3;
uint64 clientBytes = 4;
uint64 serverBytes = 5;
float byteRate = 6;
float clientByteRate = 7;
float serverByteRate = 8;
uint32 byteRate = 6;
uint32 clientByteRate = 7;
uint32 serverByteRate = 8;
uint64 packets = 9;
uint64 clientPackets = 10;
uint64 serverPackets = 11;
float packetRate = 12;
float clientPacketRate = 13;
float serverPacketRate = 14;
uint32 packetRate = 12;
uint32 clientPacketRate = 13;
uint32 serverPacketRate = 14;
}
36 changes: 18 additions & 18 deletions structs/protocolbuffers/ActiveSessions/ActiveSessions.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

52 changes: 26 additions & 26 deletions structs/protocolbuffers/SessionStatsEvent/SessionStatsEvent.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 80be653

Please sign in to comment.