Remove debugging printf(.) that was left in unixcomm.c

When Medley closes a stream open to a process it uses a "unixcomm"
command (3) which should close() the communication channel open with
the process and give it a chance to handle that and exit cleanly
before using a SIGKILL on it.  We can't determine apriori whether the
process is going to cooperate, so we're stuck trying for up to 0.1s
(arbitrary choice!)  waiting for the process to exit, then it gets a
SIGKILL, and we wait up to 0.1s again to see that it really exited.

.gitignore

@@ -6,6 +6,8 @@
 .DS_Store
 # build directories
 build/**
+*.m68k-x/**
+*.m68k/**
 *.386-x/**
 *.386/**
 *.ppc-x/**

CMakeLists.txt

@@ -390,7 +390,7 @@ SET(MAIKO_HDRS
 )
 
 ADD_CUSTOM_TARGET(gen-vdate
-  COMMAND mkvdate > vdate.c
+  COMMAND ../bin/mkvdate > vdate.c
   BYPRODUCTS vdate.c
 )
 
@@ -422,10 +422,6 @@ IF(MAIKO_DISPLAY_X11)
   TARGET_LINK_LIBRARIES(ldex ${MAIKO_LIBRARIES} ${MAIKO_DISPLAY_X11_LIBRARIES})
 ENDIF()
 
-ADD_EXECUTABLE(mkvdate src/mkvdate.c)
-TARGET_COMPILE_DEFINITIONS(mkvdate PUBLIC ${MAIKO_DEFINITIONS})
-TARGET_INCLUDE_DIRECTORIES(mkvdate PUBLIC inc)
-
 ADD_EXECUTABLE(setsout src/setsout.c src/byteswap.c)
 TARGET_COMPILE_DEFINITIONS(setsout PUBLIC ${MAIKO_DEFINITIONS})
 TARGET_INCLUDE_DIRECTORIES(setsout PUBLIC inc)

bin/machinetype

@@ -12,6 +12,7 @@
 os=${LDEARCH:-`./config.guess`}
 # o/s switch block
 case "$os" in
+        m68k-*)		      echo m68k ;;
         sparc-*)	      echo sparc ;;
         alpha-*)	      echo alpha ;;
 	i*86-*-*)             echo 386 ;;

bin/makefile-tail

@@ -160,9 +160,6 @@ $(OSARCHDIR)$(LDENAME): $(LIBFILES) $(EXTFILES) $(OBJECTDIR)vdate.o
 $(OSARCHDIR)ldeether: $(OBJECTDIR)ldeether.o $(DLPIFILES)
 	$(CC) $(OBJECTDIR)ldeether.o $(DLPIFILES) $(LDEETHERLDFLAGS) -o $(OSARCHDIR)ldeether
 
-$(OSARCHDIR)mkvdate: $(OBJECTDIR)mkvdate.o $(REQUIRED-INCS)
-	$(CC) $(OBJECTDIR)mkvdate.o $(LDFLAGS) -o $(OSARCHDIR)mkvdate
-
 $(OSARCHDIR)tstsout: $(OBJECTDIR)tstsout.o $(BYTESWAPFILES) $(REQUIRED-INCS)
 	$(CC) $(OBJECTDIR)tstsout.o $(BYTESWAPFILES) $(LDFLAGS) -lc -lm -o $(OSARCHDIR)tstsout
 
@@ -171,9 +168,9 @@ $(OSARCHDIR)setsout: $(OBJECTDIR)setsout.o $(REQUIRED-INCS)
 
 #### Component files ######################################################
 
-$(OBJECTDIR)vdate.o: $(LIBFILES) $(EXTFILES) $(OSARCHDIR)mkvdate
+$(OBJECTDIR)vdate.o: $(LIBFILES) $(EXTFILES) mkvdate
 	$(RM) $(OBJECTDIR)vdate.c
-	$(OSARCHDIR)mkvdate > $(OBJECTDIR)vdate.c
+	$(BINDIR)mkvdate > $(OBJECTDIR)vdate.c
 	$(CC) $(RFLAGS) $(OBJECTDIR)vdate.c -o $(OBJECTDIR)vdate.o
 
 $(OBJECTDIR)tstsout.o: $(SRCDIR)tstsout.c $(REQUIRED-INCS) \
@@ -197,9 +194,6 @@ $(OBJECTDIR)ldeboot.o: $(SRCDIR)ldeboot.c $(REQUIRED-INCS) \
 $(OBJECTDIR)ldeether.o: $(SRCDIR)ldeether.c $(REQUIRED-INCS)
 	$(CC) $(RFLAGS) $(SRCDIR)ldeether.c -o $(OBJECTDIR)ldeether.o
 
-$(OBJECTDIR)mkvdate.o: $(SRCDIR)mkvdate.c $(REQUIRED-INCS)
-	$(CC) $(RFLAGS) $(SRCDIR)mkvdate.c -o $(OBJECTDIR)mkvdate.o
-
 $(OBJECTDIR)main.o: $(SRCDIR)main.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)dbprint.h \
 	$(INCDIR)emlglob.h $(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)stack.h \

bin/mkvdate

@@ -0,0 +1,5 @@
+#!/bin/sh
+cat <<EOF
+#include <time.h>
+time_t MDate = $(date +%s);
+EOF

bin/osversion

@@ -1,6 +1,7 @@
 #!/bin/sh
-os=`./config.guess`
+os=${LDEARCH:-`./config.guess`}
 case "$os" in
+        m68k-*-amigaos)		echo amigaos ;;
         sparc-sun-sunos*)	echo sunos4 ;;
         sparc-sun-solaris1*)	echo sunos4 ;;
         *-*-solaris2*)	        echo sunos5 ;;

inc/commondefs.h

@@ -3,6 +3,4 @@
 void stab(void);
 void warn(const char *s);
 int error(const char *s);
-int stackcheck(void);
-void stackoverflow(void);
 #endif

inc/maiko/platform.h

@@ -59,6 +59,13 @@
 #  define MAIKO_OS_DETECTED 1
 #endif
 
+#ifdef amigaos3
+#  define MAIKO_OS_AMIGAOS3 1
+#  define MAIKO_OS_NAME "AmigaOS 3"
+#  define MAIKO_OS_UNIX_LIKE 1
+#  define MAIKO_OS_DETECTED 1
+#endif
+
 /* __SVR4: Defined by clang, gcc, and Sun Studio.
  * __SVR4__ was only defined by Sun Studio. */
 #if defined(__sun) && defined(__SVR4)
@@ -137,6 +144,13 @@
 #  define MAIKO_ARCH_DETECTED 1
 #endif
 
+#ifdef __mc68000
+#  define MAIKO_ARCH_M68000 1
+#  define MAIKO_ARCH_NAME "Motorola68K"
+#  define MAIKO_ARCH_WORD_BITS 32
+#  define MAIKO_ARCH_DETECTED 1
+#endif
+
 /* Modern GNU C, Clang, Sun Studio  provide __BYTE_ORDER__
  * Older GNU C (ca. 4.0.1) provides __BIG_ENDIAN__/__LITTLE_ENDIAN__
  */

inc/version.h

@@ -187,8 +187,8 @@ error Must specify RELEASE to build Medley.
 
 	/* Set up defaults */
 #define UNALIGNED_FETCH_OK
-#define UNSIGNED unsigned long
-#define INT long
+typedef unsigned long UNSIGNED;
+typedef long INT;
 
 
 
@@ -237,9 +237,9 @@ typedef unsigned char u_char;
 typedef unsigned long u_int;
 typedef unsigned short u_short;
 #undef UNALIGNED_FETCH_OK
-#define USHORT unsigned
+typedef unsigned USHORT;
 #else
-#define USHORT unsigned short
+typedef unsigned short USHORT;
 #endif /* DOS */
 
 	/****************************************************************/

src/common.c

@@ -141,39 +141,3 @@ uraidloop:
 
 void warn(const char *s)
 { printf("\nWARN: %s \n", s); }
-
-/*****************************************************************
-stackcheck
-
-        common sub-routine.
-
-        Not Implemented.
-
-        1.check Stack overflow.
-                (check CurrentStackPTR)
-        2.if overflow, return T (not 0).
-          Otherwise, return F (0).
-******************************************************************/
-int stackcheck() {
-#ifdef TRACE2
-  printf("TRACE:stackcheck()\n");
-#endif
-  return (0);
-}
-
-/*****************************************************************
-stackoverflow
-
-        common sub-routine.
-
-        Not Implemented.
-
-        1.error handling of stack overflow.
-******************************************************************/
-
-void stackoverflow() {
-#ifdef TRACE2
-  printf("TRACE:stackoverflow()\n");
-#endif
-  printf("stackoverflow \n");
-}

src/unixcomm.c

@@ -89,7 +89,6 @@ enum UJTYPE {
 /* These are indexed by WRITE socket# */
 struct unixjob {
   char *pathname; /* used by Lisp direct socket access subr */
-  int readsock;   /* Socket to READ from for this job. */
   int PID;        /* process ID associated with this slot */
   int status;     /* status returned by subprocess (not shell) */
   enum UJTYPE type;
@@ -284,7 +283,6 @@ int FindUnixPipes(void) {
   cleareduj.status = -1;
   cleareduj.pathname = NULL;
   cleareduj.PID = 0;
-  cleareduj.readsock = 0;
   cleareduj.type = UJUNUSED;
   for (int i = 0; i < NPROCS; i++) UJ[i] = cleareduj;
 
@@ -374,7 +372,7 @@ LispPTR Unix_handlecomm(LispPTR *args) {
 
   /* Get command */
   N_GETNUMBER(args[0], command, bad);
-  DBPRINT(("\nUnix_handlecomm: trying %d\n", command));
+  DBPRINT(("\nUnix_handlecomm: command %d\n", command));
 
   switch (command) {
     case 0: /* Fork pipe process */
@@ -435,9 +433,9 @@ LispPTR Unix_handlecomm(LispPTR *args) {
         UJ[PipeFD].type = UJPROCESS;
         UJ[PipeFD].status = -1;
         UJ[PipeFD].PID = (d[1] << 8) | d[2] | (d[4] << 16) | (d[5] << 24);
-        UJ[PipeFD].readsock = 0;
         close(sockFD);
         unlink(PipeName);
+        DBPRINT(("New process: slot/PipeFD %d PID %d\n", PipeFD, UJ[PipeFD].PID));
         return (GetSmallp(PipeFD));
       } else {
         DBPRINT(("Fork request failed."));
@@ -482,17 +480,11 @@ LispPTR Unix_handlecomm(LispPTR *args) {
       N_GETNUMBER(args[1], slot, bad); /* Get job # */
 
       if (!valid_slot(slot)) return (NIL); /* No fd open; punt the read */
-
-      if (UJ[slot].readsock)
-        sock = UJ[slot].readsock;
-      else
-        sock = slot;
-
       switch (UJ[slot].type) {
         case UJPROCESS:
         case UJSHELL:
         case UJSOSTREAM:
-          TIMEOUT(dest = read(sock, buf, 1));
+          TIMEOUT(dest = read(slot, buf, 1));
           if (dest > 0) return (GetSmallp(buf[0]));
           /* Something's amiss; check our process status */
           wait_for_comm_processes();
@@ -523,66 +515,46 @@ LispPTR Unix_handlecomm(LispPTR *args) {
 
       N_GETNUMBER(args[1], slot, bad);
 
-      DBPRINT(("Killing process in slot %d.\n", slot));
-
-      if (valid_slot(slot)) switch (UJ[slot].type) {
-          case UJSHELL:
-          case UJPROCESS:
-            /* First check to see it hasn't already died */
-            if (UJ[slot].status == -1) {
-              /* Kill the job */
-              kill(UJ[slot].PID, SIGKILL);
-              for (int i = 0; i < 10; i++) {
-                /* Waiting for the process to exit is possibly risky.
-                   Sending SIGKILL is always supposed to kill
-                   a process, but on very rare occurrences this doesn't
-                   happen because of a Unix kernel bug, usually a user-
-                   written device driver which hasn't been fully
-                   debugged.  So we time it out just be safe. */
-                if (UJ[slot].status != -1) break;
-                wait_for_comm_processes();
-                usleep(10);
-              }
-            }
-            break;
-          default: break;
-          }
-      else
-        return (ATOM_T);
-
+      DBPRINT(("Terminating process in slot %d.\n", slot));
+      if (!valid_slot(slot)) return (ATOM_T);
+      /* in all cases we need to close() the file descriptor */
+      close(slot);
       switch (UJ[slot].type) {
-        case UJUNUSED:
-          break;
-
-        case UJSHELL:
-          DBPRINT(("Kill 3 closing shell desc %d.\n", slot));
-          close(slot);
-          break;
-
-        case UJPROCESS:
-          DBPRINT(("Kill 3 closing process desc %d.\n", slot));
-          close(slot);
-          if (UJ[slot].readsock) close(UJ[slot].readsock);
-          break;
-
-        case UJSOSTREAM:
-          DBPRINT(("Kill 3 closing stream socket desc %d.\n", slot));
-          close(slot);
-          break;
-
-        case UJSOCKET:
-          DBPRINT(("Kill 3 closing raw socket desc %d.\n", slot));
-          close(slot);
+      case UJSHELL:
+      case UJPROCESS:
+        /* wait for up to 0.1s for it to exit on its own after the close() */
+        for (int i = 0; i < 10; i++) {
+          wait_for_comm_processes();
+          if (UJ[slot].status != -1) break;
+          usleep(10000);
+        }
+        /* check again before we terminate it */
+        if (UJ[slot].status != -1) break;
+        kill(UJ[slot].PID, SIGKILL);
+        for (int i = 0; i < 10; i++) {
+          /* Waiting for the process to exit is possibly risky.
+             Sending SIGKILL is always supposed to kill
+             a process, but on very rare occurrences this doesn't
+             happen because of a Unix kernel bug, usually a user-
+             written device driver which hasn't been fully
+             debugged.  So we time it out just be safe. */
+          wait_for_comm_processes();
+          usleep(10000);
+          if (UJ[slot].status != -1) break;
+        }
+        break;
+      case UJSOCKET:
+        if (UJ[slot].pathname) {
           DBPRINT(("Unlinking %s\n", UJ[slot].pathname));
-          if (UJ[slot].pathname) {
-            if (unlink(UJ[slot].pathname) < 0) perror("Kill 3 unlink");
-            free(UJ[slot].pathname);
-            UJ[slot].pathname = NULL;
-          }
-          break;
+          if (unlink(UJ[slot].pathname) < 0) perror("Kill 3 unlink");
+          free(UJ[slot].pathname);
+          UJ[slot].pathname = NULL;
+        }
+        break;
+      default: break;
       }
       UJ[slot].type = UJUNUSED;
-      UJ[slot].readsock = UJ[slot].PID = 0;
+      UJ[slot].PID = 0;
       UJ[slot].pathname = NULL;
 
       /* If status available, return it, otherwise T */
@@ -674,8 +646,6 @@ LispPTR Unix_handlecomm(LispPTR *args) {
         case UJPROCESS:
           DBPRINT(("Kill 5 closing process desc %d.\n", dest));
           close(dest);
-          if (UJ[dest].readsock) close(UJ[dest].readsock);
-          UJ[dest].readsock = 0;
           break;
 
         case UJSOCKET:
@@ -696,7 +666,7 @@ LispPTR Unix_handlecomm(LispPTR *args) {
       }
 
       UJ[dest].type = UJUNUSED;
-      UJ[dest].readsock = UJ[dest].PID = 0;
+      UJ[dest].PID = 0;
       return (ATOM_T);
     /* break; */
 
@@ -729,18 +699,13 @@ LispPTR Unix_handlecomm(LispPTR *args) {
         N_GETNUMBER(args[1], slot, bad);     /* Get job # */
         if (!valid_slot(slot)) return (NIL); /* No fd open; punt the read */
 
-        if (UJ[slot].readsock)
-          sock = UJ[slot].readsock;
-        else
-          sock = slot;
-
         bufp = (Addr68k_from_LADDR(args[2])); /* User buffer */
         DBPRINT(("Read buffer slot %d, type is %d\n", slot, UJ[slot].type));
 
         switch (UJ[slot].type) {
           case UJSHELL:
           case UJPROCESS:
-          case UJSOSTREAM: dest = read(sock, bufp, 512);
+          case UJSOSTREAM: dest = read(slot, bufp, 512);
 #ifdef BYTESWAP
             word_swap_page(bufp, 128);
 #endif /* BYTESWAP */