Fix an old bug with pollpip outputting nulls. Don't output carriage returns if

outputting to a file.  Arrange that FPRINTF will pre4pend a newline if following
pollpip output.  Add logging for turning on SIGIO and for setsockopt via the
primitive.

Author: eliotmiranda

platforms/unix/plugins/SocketPlugin/sqUnixSocket.c

@@ -180,21 +180,21 @@ typedef struct privateSocketStruct
   int acceptedSock;		/* a connection that has been accepted */
 } privateSocketStruct;
 
-#define CONN_NOTIFY	(1<<0)
-#define READ_NOTIFY	(1<<1)
+#define CONN_NOTIFY		(1<<0)
+#define READ_NOTIFY		(1<<1)
 #define WRITE_NOTIFY	(1<<2)
 
-#define PING(S,EVT)						\
-{								\
-  FPRINTF((stderr, "notify %d %s\n", (S)->s, #EVT));		\
+#define PING(S,EVT)	\
+{																\
+  FPRINTF((stderr, "notify %d %s\n", (S)->s, #EVT));			\
   interpreterProxy->signalSemaphoreWithIndex((S)->EVT##Sema);	\
 }
 
 #define notify(SOCK,MASK)						\
-{									\
-  if ((MASK) & CONN_NOTIFY)  PING(SOCK,conn);				\
-  if ((MASK) & READ_NOTIFY)  PING(SOCK,read);				\
-  if ((MASK) & WRITE_NOTIFY) PING(SOCK,write);				\
+{												\
+  if ((MASK) & CONN_NOTIFY)  PING(SOCK,conn);	\
+  if ((MASK) & READ_NOTIFY)  PING(SOCK,read);	\
+  if ((MASK) & WRITE_NOTIFY) PING(SOCK,write);	\
 }
 
 
@@ -203,7 +203,7 @@ typedef struct privateSocketStruct
 #define _PSP(S)		(((S)->privateSocketPtr))
 #define PSP(S)		((privateSocketStruct *)((S)->privateSocketPtr))
 
-#define SOCKET(S)		(PSP(S)->s)
+#define SOCKET(S)			(PSP(S)->s)
 #define SOCKETSTATE(S)		(PSP(S)->sockState)
 #define SOCKETERROR(S)		(PSP(S)->sockError)
 #define SOCKETPEER(S)		(PSP(S)->peer)
@@ -1419,9 +1419,11 @@ sqSocketSetOptionsoptionNameStartoptionNameSizeoptionValueStartoptionValueSizere
 			   endptr - buf == optionValueSize)) /* are all option chars digits? */
 			{
 			  val= strtol(buf, &endptr, 0);
-				  memcpy((void *)buf, (void *)&val, sizeof(val));
-				  optionValueSize= sizeof(val);
+			  memcpy((void *)buf, (void *)&val, sizeof(val));
+			  optionValueSize= sizeof(val);
 			}
+		  FPRINTF((stderr,"setsockopt(%d,%.*s)\n",
+					SOCKET(s), optionNameSize, optionName));
 		  if ((setsockopt(PSP(s)->s, opt->optlevel, opt->optname,
 						  (const void *)buf, optionValueSize)) < 0)
 			{

platforms/unix/vm/aio.c

@@ -187,6 +187,8 @@ static stack_t signal_stack;
 
 /* initialise asynchronous i/o */
 
+static int stderrIsAFile = 0; // for pollpip to avoid cluttering logs
+
 void 
 aioInit(void)
 {
@@ -199,6 +201,8 @@ aioInit(void)
 	FD_ZERO(&xdMask);
 	maxFd = 0;
 
+	stderrIsAFile = !isatty(fileno(stderr));
+
 	signal(SIGPIPE, SIG_IGN);
 #if !USE_SIGALTSTACK
 	signal(SIGIO, forceInterruptCheck);
@@ -275,12 +279,14 @@ extern long disownCount;
 static char *ticks = "-\\|/";
 static char *ticker = "";
 static int tickCount = 0;
+long pollpipOutput = 0;
 
 #define TICKS_PER_CHAR 10
-#define DO_TICK(bool)				\
-do if ((bool) && !(++tickCount % TICKS_PER_CHAR)) {		\
-	fprintf(stderr, "\r%c\r", *ticker);		\
-	if (!*ticker++) ticker= ticks;			\
+#define DO_TICK(bool)											\
+do if ((bool) && !(++tickCount % TICKS_PER_CHAR)) {				\
+	if (!*ticker) ticker = ticks;								\
+	fprintf(stderr, stderrIsAFile ? "%c" : "\r%c\r", *ticker++);\
+	pollpipOutput = 1;											\
 } while (0)
 
 long 
@@ -294,18 +300,17 @@ aioPoll(long microSeconds)
 	extern void forceInterruptCheck(int);	/* not really, but hey */
 #endif
 
-#if defined(AIO_DEBUG) && AIO_DEBUG >= 2
-	FPRINTF((stderr, "aioPoll(%ld)\n", microSeconds));
-#endif
+	DO_TICK(SHOULD_TICK());
 
+#if defined(AIO_DEBUG)
+# if AIO_DEBUG >= 2
+	FPRINTF((stderr, "aioPoll(%ld)\n", microSeconds));
+# endif
 	// check that our signal handler is in place.
 	// If it isn't, things aren't right.
-#if AIO_DEBUG
 	sigaction(SIGIO, NULL, &current_sigio_action);
 	assert(current_sigio_action.sa_handler == forceInterruptCheck);
 #endif
-	DO_TICK(SHOULD_TICK());
-
 	/*
 	 * get out early if there is no pending i/o and no need to relinquish
 	 * cpu
@@ -315,7 +320,7 @@ aioPoll(long microSeconds)
 	if (maxFd == 0)
 		return 0;
 #else
-	if ((maxFd == 0) && (microSeconds == 0))
+	if (maxFd == 0 && microSeconds == 0)
 		return 0;
 #endif
 
@@ -403,7 +408,6 @@ aioSleepForUsecs(long microSeconds)
 void 
 aioEnable(int fd, void *data, int flags)
 {
-	FPRINTF((stderr, "aioEnable(%d)\n", fd));
 	if (fd < 0) {
 		FPRINTF((stderr, "aioEnable(%d): IGNORED\n", fd));
 		return;
@@ -423,6 +427,7 @@ aioEnable(int fd, void *data, int flags)
 	if (flags & AIO_EXT) {
 		FD_SET(fd, &xdMask);
 		/* we should not set NBIO ourselves on external descriptors! */
+		FPRINTF((stderr, "aioEnable(%d): external\n", fd));
 	}
 	else {
 		/*
@@ -440,6 +445,7 @@ aioEnable(int fd, void *data, int flags)
 			perror("fcntl(F_GETFL)");
 		if (fcntl(fd, F_SETFL, arg | O_NONBLOCK | O_ASYNC) < 0)
 			perror("fcntl(F_SETFL, O_ASYNC)");
+		FPRINTF((stderr, "aioEnable(%d): Elicit SIGIO via O_ASYNC/fcntl\n", fd));
 
 #elif defined(FASYNC)
 		if (fcntl(fd, F_SETOWN, getpid()) < 0)
@@ -448,6 +454,7 @@ aioEnable(int fd, void *data, int flags)
 			perror("fcntl(F_GETFL)");
 		if (fcntl(fd, F_SETFL, arg | O_NONBLOCK | FASYNC) < 0)
 			perror("fcntl(F_SETFL, FASYNC)");
+		FPRINTF((stderr, "aioEnable(%d): Elicit SIGIO via FASYNC/fcntl\n", fd));
 
 #elif defined(FIOASYNC)
 		arg = getpid();
@@ -456,6 +463,9 @@ aioEnable(int fd, void *data, int flags)
 		arg = 1;
 		if (ioctl(fd, FIOASYNC, &arg) < 0)
 			perror("ioctl(FIOASYNC, 1)");
+		FPRINTF((stderr, "aioEnable(%d): Elicit SIGIO via FIOASYNC/fcntl\n", fd));
+#else
+		FPRINTF((stderr, "aioEnable(%d): UNABLE TO ELICIT SIGIO!!\n", fd));
 #endif
 	}
 }

platforms/unix/vm/sqaio.h

@@ -111,15 +111,17 @@ extern char *(*handlerNameChain)(aioHandler h);
       platReportError((os_error *)&privateErr); \
     } while (0)
 # else /* !ACORN */
-    extern long aioLastTick, aioThisTick, aioDebugLogging, ioMSecs(void);
+    extern long aioLastTick, aioThisTick, aioDebugLogging, pollpipOutput;
+    extern long ioMSecs(void);
 	extern const char *__shortFileName(const char *);
-#   define FPRINTF(X) do { if (aioDebugLogging) { \
-	aioThisTick = ioMSecs(); \
-	fprintf(stderr, "%8ld %4ld %s:%d ", \
-			aioThisTick, aioThisTick - aioLastTick, \
-			__shortFileName(__FILE__),__LINE__); \
-	aioLastTick = aioThisTick; \
-	fprintf X; } } while (0)
+#   define FPRINTF(X) do if (aioDebugLogging) {		\
+	aioThisTick = ioMSecs();						\
+	if (pollpipOutput) fputc('\n',stderr);			\
+	fprintf(stderr, "%8ld %4ld %s:%d ",				\
+			aioThisTick, aioThisTick - aioLastTick,	\
+			__shortFileName(__FILE__),__LINE__);	\
+	aioLastTick = aioThisTick;						\
+	fprintf X; pollpipOutput = 0; } while (0)
 # endif /* ACORN */
 #else /* !AIO_DEBUG */
 # define FPRINTF(X)