5.4.6 Change the number of CPU to 3 for 3 bounded SCTP/RMR threads insted of 1

add in remarks move to meid/RAN name with decimal number in the GNB-ID value

Change-Id: Ieb4544e053b7c47940f5231b4727d2a984bb22e9
Signed-off-by: aa7133@att.com <aa7133@att.com>

diff --git a/RIC-E2-TERMINATION/BuildRunName.h b/RIC-E2-TERMINATION/BuildRunName.h
index 6aff4dc..3d4dc85 100644 (file)
--- a/RIC-E2-TERMINATION/BuildRunName.h
+++ b/RIC-E2-TERMINATION/BuildRunName.h
@@ -56,7 +56,21 @@ static int translateBitStringToChar(char *ranName, BIT_STRING_t &data) {
     // dont care of last unused bits
     char buffer[256] {};
     auto j = snprintf(buffer, 256, "%s_", ranName);
+
+    memcpy(ranName, buffer, j);
+/*
+ // ran name decimal
+    unsigned long bitValue = 0;
+    for (auto i = 0; i < (int)data.size; i++) {
+        bitValue <<= (unsigned long)8;
+        bitValue += data.buf[i];
+    }
+
+    j = snprintf(buffer, 256, "%s%ld", ranName, bitValue);
+
     memcpy(ranName, buffer, j);
+*/
+
 
     unsigned b1 = 0;
     unsigned b2 = 0;

diff --git a/RIC-E2-TERMINATION/container-tag.yaml b/RIC-E2-TERMINATION/container-tag.yaml
index 486b35d..7219462 100644 (file)
--- a/RIC-E2-TERMINATION/container-tag.yaml
+++ b/RIC-E2-TERMINATION/container-tag.yaml
@@ -1,3 +1,3 @@
 # The Jenkins job requires a tag to build the Docker image.
 # Global-JJB script assumes this file is in the repo root.
-tag: 5.4.5
+tag: 5.4.6

diff --git a/RIC-E2-TERMINATION/sctpThread.cpp b/RIC-E2-TERMINATION/sctpThread.cpp
index 310e8a4..d3e00df 100644 (file)
--- a/RIC-E2-TERMINATION/sctpThread.cpp
+++ b/RIC-E2-TERMINATION/sctpThread.cpp
@@ -391,7 +391,7 @@ int main(const int argc, char **argv) {
     std::vector<std::thread> threads(num_cpus);
 //    std::vector<std::thread> threads;
 
-    num_cpus = 1;
+    num_cpus = 3;
     for (unsigned int i = 0; i < num_cpus; i++) {
         threads[i] = std::thread(listener, &sctpParams);