game_console: fix logs paging, fix test, change submodule path

Author: RuslanKutdusov

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "services/game_console/hw/mbed-os"]
 	path = services/game_console/hw/mbed-os
-	url = https://github.com/ARMmbed/mbed-os.git
-	branch = tags/mbed-os-5.12.4
+	url = git@github.com:HackerDom/mbed-os.git
+	branch = hackerdom

services/game_console/hw/mbed-os

@@ -71,13 +71,15 @@ char* GetPage(uint32_t pageIdx, uint32_t& pageSize)
     std::mutex GMutex;
     uint32_t pagesNum = (GLog.size() + kPageSize - 1) / kPageSize;
     if(pageIdx == ~0u)
-        pageIdx = pagesNum - 1;
-    if(pageIdx >= pagesNum)
+        pageIdx = pagesNum;
+    if(pageIdx == 0 || pageIdx > pagesNum)
     {
         pageSize = 0;
         return nullptr;
     }
 
+    pageIdx--;
+
     uint32_t firstLineIdx = pageIdx * kPageSize;
     uint32_t lastLineIdx =  firstLineIdx + kPageSize - 1;
     if(lastLineIdx >= GLog.size())

services/game_console/server/log.cpp

@@ -11,13 +11,13 @@
 
 int main(int argc, char* argv[])
 {
-    if(argc < 3)
+    if(argc < 2)
         return -1;
 
     sockaddr_in addr;
     addr.sin_family = AF_INET;
     inet_aton(argv[1], &addr.sin_addr);
-    addr.sin_port = htons(atoi(argv[2]));
+    addr.sin_port = htons(8002);
 
     int sock = -1;
 

services/game_console/server_test/cs_test.cpp

@@ -8,6 +8,7 @@
 import time
 import random
 import string
+import time
 
 serverAddr = argv[1]
 userName = argv[2]
@@ -28,6 +29,8 @@
 notifySock.connect((serverAddr, 8001))
 notifySock.send(authKeyRaw)
 
+lastNotificationTime = 0
+
 while True:
     try:
         data = notifySock.recv(16, socket.MSG_DONTWAIT)
@@ -41,16 +44,20 @@
             print("Notifications available: %u" % notificationsNum)
             notifySock.send(data)
 
-            url = 'http://%s/notification?auth=%x' % (serverAddr, authKey)
-            r = requests.get(url)
-            if r.status_code != 200:
-                printf("Get notification failed")
-            if len(r.content) > 0:
-                print("Got notification")
+            for i in range(0, notificationsNum):
+                url = 'http://%s/notification?auth=%x' % (serverAddr, authKey)
+                r = requests.get(url)
+                if r.status_code != 200:
+                    printf("Get notification failed")
+                if len(r.content) > 0:
+                    print("Got notification")
     except:
         pass
 
     method = int(random.uniform(0, 6))
+    if method == 5 and time.time() - lastNotificationTime < 5:
+        continue
+
     if method == 0:
         url = 'http://%s/auth?u=%s&p=%s' % (serverAddr, userName, password)
     if method == 1:
@@ -79,6 +86,8 @@
         print(url)
         requests.post(url=url, data=notification, headers={'Content-Type': 'application/octet-stream'})
 
+        lastNotificationTime = time.time()
+
     if method != 5:
         print(url)
         r = requests.get(url)