From: Jakob Frick <redacted>
Date: Tue, 4 Jul 2023 13:26:57 +0000 (+0100)
Subject: dolly : update error print behavior (#337)
X-Git-Tag: upstream/0.0.1642~1355
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=2348110221c6529f466ec2f605f9fa3dd98c97aa;p=pkg%2Fggml%2Fsources%2Fggml

dolly : update error print behavior (#337)
---

diff --git a/examples/dolly-v2/main.cpp b/examples/dolly-v2/main.cpp
index b95c5b1c..4d497b01 100644
--- a/examples/dolly-v2/main.cpp
+++ b/examples/dolly-v2/main.cpp
@@ -785,7 +785,7 @@ std::string execute_prompt(
 int setup_port(const int port) {
     int sockfd = socket(AF_INET, SOCK_STREAM, 0);
     if (sockfd < 0) {
-        std::cerr << "Failed to create socket\n";
+        fprintf(stderr, "%s: Failed to create new socket\n", __func__);
         return -1;
     }
 
@@ -797,12 +797,12 @@ int setup_port(const int port) {
     servaddr.sin_port = htons(port);
 
     if (bind(sockfd, (struct sockaddr *)&servaddr, sizeof(servaddr)) < 0) {
-        std::cerr << "Failed to bind to port\n";
+        fprintf(stderr, "%s: Failed to bind to port %i\n", __func__, port);
         return -1;
     }
 
     if (listen(sockfd, 10) < 0) {
-        std::cerr << "Failed to listen on socket\n";
+        fprintf(stderr, "%s: Failed to listen to socket on port %i\n", __func__, port);
         return -1;
     }
     return sockfd;
@@ -810,7 +810,7 @@ int setup_port(const int port) {
 
 std::string read_from_port(int sockfd, int clientfd) {
     if (clientfd < 0) {
-        std::cerr << "Failed to accept new connection\n";
+        fprintf(stderr, "%s: Failed to accept new connection\n", __func__);
         return "";
     }
 
@@ -818,7 +818,7 @@ std::string read_from_port(int sockfd, int clientfd) {
     std::memset(buffer, 0, sizeof(buffer));
 
     if (read(clientfd, buffer, sizeof(buffer)) < 0) {
-        std::cerr << "Failed to read from client\n";
+        fprintf(stderr, "%s: Failed to read from client\n", __func__);
     } else {
         std::cout << "Received: " << buffer;
         return std::string(buffer);
@@ -915,11 +915,11 @@ int main(int argc, char ** argv) {
 #if defined(DOLLY_INTERACTIVE_PORT)
             if (params.interactive_port != -1) {
                 if (write(clientfd, response.c_str(), response.size()) < 0) {
-                    std::cerr << "Failed to write to client\n";
+                    fprintf(stderr, "%s: Failed to write answer '%s' to client\n", __func__, response.c_str());
                 }
 
                 if (close(clientfd) < 0) {
-                    std::cerr << "Failed to close client socket\n";
+                    fprintf(stderr, "%s: Failed to close client socket\n", __func__);
                 }
             } else
 #endif
@@ -953,7 +953,7 @@ int main(int argc, char ** argv) {
 
 #if defined(DOLLY_INTERACTIVE_PORT)
     if (params.interactive_port != -1 && close(sockfd) < 0) {
-        std::cerr << "Failed to close server socket\n";
+        fprintf(stderr, "%s: Failed to close server socket\n", __func__);
     }
 #endif