Merge perch.ndb.mysql.com:/home/jonas/src/50-work (f62a53f2) · Commits · Software / OSDI20 Artifacts / mariadb

ndb/src/common/util/socket_io.cpp

+50 −32

Original line number	Diff line number	Diff line
		@@ -53,10 +53,6 @@ readln_socket(NDB_SOCKET_TYPE socket, int timeout_millis,
		if(buflen <= 1)
		return 0;

		int sock_flags= fcntl(socket, F_GETFL);
		if(fcntl(socket, F_SETFL, sock_flags \| O_NONBLOCK) == -1)
		return -1;

		fd_set readset;
		FD_ZERO(&readset);
		FD_SET(socket, &readset);
		@@ -71,43 +67,65 @@ readln_socket(NDB_SOCKET_TYPE socket, int timeout_millis,
		}

		if(selectRes == -1){
		fcntl(socket, F_SETFL, sock_flags);
		return -1;
		}

		const int t = recv(socket, buf, buflen, MSG_PEEK);
		char* ptr = buf;
		int len = buflen;
		do
		{
		int t;
		while((t = recv(socket, ptr, len, MSG_PEEK)) == -1 && errno == EINTR);

		if(t < 1)
		{
		fcntl(socket, F_SETFL, sock_flags);
		return -1;
		}


		for(int i = 0; i<t; i++)
		{
		if(buf[i] == '\n'){
		int r= recv(socket, buf, i+1, 0);
		buf[i+1]= 0;
		if(r < 1) {
		fcntl(socket, F_SETFL, sock_flags);
		if(ptr[i] == '\n')
		{
		/**
		* Now consume
		*/
		for (len = 1 + i; len; )
		{
		while ((t = recv(socket, ptr, len, 0)) == -1 && errno == EINTR);
		if (t < 1)
		return -1;
		ptr += t;
		len -= t;
		}
		ptr[0]= 0;
		return ptr - buf;
		}

		if(i > 0 && buf[i-1] == '\r'){
		buf[i-1] = '\n';
		buf[i]= '\0';
		}

		fcntl(socket, F_SETFL, sock_flags);
		return r;
		for (int tmp = t; tmp; )
		{
		while ((t = recv(socket, ptr, tmp, 0)) == -1 && errno == EINTR);
		if (t < 1)
		{
		return -1;
		}
		ptr += t;
		len -= t;
		tmp -= t;
		}

		int r= recv(socket, buf, t, 0);
		if(r>=0)
		buf[r] = 0;
		fcntl(socket, F_SETFL, sock_flags);
		return r;
		FD_ZERO(&readset);
		FD_SET(socket, &readset);
		timeout.tv_sec = (timeout_millis / 1000);
		timeout.tv_usec = (timeout_millis % 1000) * 1000;
		const int selectRes = select(socket + 1, &readset, 0, 0, &timeout);
		if(selectRes != 1){
		return -1;
		}
		} while (len > 0);

		return -1;
		}

		extern "C"