Skip to content

Commit

Permalink
dolly : update error print behavior (#337)
Browse files Browse the repository at this point in the history
  • Loading branch information
koogle committed Jul 4, 2023
1 parent b2b6de8 commit 2348110
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions examples/dolly-v2/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -797,28 +797,28 @@ 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;
}

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 "";
}

char buffer[4096];
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);
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 2348110

Please sign in to comment.