Path: utzoo!utgpu!watmath!iuvax!mailrus!cornell!steig
From: steig@hermod.cs.cornell.edu (Mark J. Steiglitz)
Newsgroups: comp.sys.isis
Subject: pmake 1.3.1 patch2
Message-ID: <34230@cornell.UUCP>
Date: 14 Nov 89 20:38:33 GMT
Sender: nobody@cornell.UUCP
Reply-To: steig@cs.cornell.edu (Mark J. Steiglitz)
Organization: Cornell Univ. CS Dept, Ithaca NY
Lines: 172

This patch fixes a few bugs that appeared in pmake because of changes to the
ISIS interface from ISIS 1.1 to ISIS 1.2.

Below is a context diff of the changes from pmake 1.3.1 patch level 1 to
pmake 1.3.1 patch level 2.  Save this file into the demos/pmk directory in your
ISIS 1.3.1 distribution and run patch on it using the command:

patch <filename

Also, please report to me any bugs that you find in pmake.

-- 
|Mark J. Steiglitz, 316 Thurston Ave. Apt. B14, Ithaca, NY 14850, 607-257-7319|
|Bitnet: steig@CRNLVAX5                                                       |
|Internet: steig@cs.cornell.edu                                               |
|Usenet:..{cmcl2,shasta,uw-beaver,rochester,mailrus}!cornell!steig            |

*** pmkexec.c.orig	Mon Nov 13 19:06:09 1989
--- pmkexec.c	Mon Nov 13 19:54:30 1989
***************
*** 699,705 ****
        init_rt();
        
        /* set the current view */
!       cur_view = *pg_getview(my_gid);
        
        dbgp "init view\n" dbge;
        
--- 699,705 ----
        init_rt();
        
        /* set the current view */
!       cur_view = *pg_getview(&my_gid);
        
        dbgp "init view\n" dbge;
        
***************
*** 1063,1069 ****
  	    if(cur_view.gv_members[1].site==0)
  	      {
  		/* leave the group - Accept no more changes */
! 		/* pg_delete(my_gid); */
  		exit(0);
  	      } 
  	  }
--- 1063,1069 ----
  	    if(cur_view.gv_members[1].site==0)
  	      {
  		/* leave the group - Accept no more changes */
! 		/* pg_delete(&my_gid); */
  		exit(0);
  	      } 
  	  }
***************
*** 1070,1076 ****
  	else
  	  { 
  	    /* leave the group - Accept no more changes */
! 	    /* pg_leave(my_gid); */ 
  	    exit(0);
  	  }
        }
--- 1070,1076 ----
  	else
  	  { 
  	    /* leave the group - Accept no more changes */
! 	    /* pg_leave(&my_gid); */ 
  	    exit(0);
  	  }
        }
***************
*** 1220,1226 ****
    dbgp "see request %d from %d\n",cur_step->step_num,server_num dbge;
  
    /* set the current view */
!   my_view = pg_getview(my_gid);
        
    /* decide whether or not the step is under my jurisdiction.  Does it point
       to my server or is it ovned by a DOWN server and I am oldest */
--- 1220,1226 ----
    dbgp "see request %d from %d\n",cur_step->step_num,server_num dbge;
  
    /* set the current view */
!   my_view = pg_getview(&my_gid);
        
    /* decide whether or not the step is under my jurisdiction.  Does it point
       to my server or is it ovned by a DOWN server and I am oldest */
***************
*** 1275,1281 ****
    /* note reciept of transfer sent by central scheduler */
    if (cur_server->state == STEP_SENT) cur_server->state = SERVER_UP;
  
!   my_view = pg_getview(my_gid);
    
    /* step transfers are invalid if the view changed. */
    if (view_id != my_view->gv_viewid)
--- 1275,1281 ----
    /* note reciept of transfer sent by central scheduler */
    if (cur_server->state == STEP_SENT) cur_server->state = SERVER_UP;
  
!   my_view = pg_getview(&my_gid);
    
    /* step transfers are invalid if the view changed. */
    if (view_id != my_view->gv_viewid)
***************
*** 1395,1401 ****
  */
  { dbgp "accept kill\n" dbge;
    
!   pg_leave(my_gid);
    
    /* see if I should post the graph */
    if (!cur_view.gv_members[1].site)
--- 1395,1401 ----
  */
  { dbgp "accept kill\n" dbge;
    
!   pg_leave(&my_gid);
    
    /* see if I should post the graph */
    if (!cur_view.gv_members[1].site)
***************
*** 1518,1524 ****
  		      sites[0]=site_view->sv_slist[cur_site];
  		      sites[1]=0;
  		      
! 		      err = isis_rexec(1,NULLADDRESS,sites,prog,args,environ,
  				       "isis","nullpass",pname);
  		      if (pname->site == 0) pmkerr("can't start server");
  		      dbgp "r_exec = %d entry %d\n", err,pname->entry dbge;
--- 1518,1524 ----
  		      sites[0]=site_view->sv_slist[cur_site];
  		      sites[1]=0;
  		      
! 		      err = isis_rexec(1,&NULLADDRESS,sites,prog,args,environ,
  				       "isis","nullpass",pname);
  		      if (pname->site == 0) pmkerr("can't start server");
  		      dbgp "r_exec = %d entry %d\n", err,pname->entry dbge;
***************
*** 1587,1593 ****
      my_gid = *pg_join(my_gname,
  	       PG_XFER,0,send_DAG,rcv_DAG,PG_MONITOR,accept_change,0,0);
      
!     cur_view= *pg_getview(my_gid);
  
      /*  NOT NEEDED - I ALWAYS SEE MYSELF JOIN 
      if(!my_server) my_server = (server_type *)new_proc("origin",&servers);
--- 1587,1593 ----
      my_gid = *pg_join(my_gname,
  	       PG_XFER,0,send_DAG,rcv_DAG,PG_MONITOR,accept_change,0,0);
      
!     cur_view= *pg_getview(&my_gid);
  
      /*  NOT NEEDED - I ALWAYS SEE MYSELF JOIN 
      if(!my_server) my_server = (server_type *)new_proc("origin",&servers);
***************
*** 1632,1638 ****
        sscanf(argv[4],"%d",&num_procs);
        getwd(my_cwd);
        
!    } else if (argc=4)
       { /* no file name - I'm not first. */
         strcpy(my_gname,argv[1]);
         sscanf(argv[2],"%d",&my_port);
--- 1632,1638 ----
        sscanf(argv[4],"%d",&num_procs);
        getwd(my_cwd);
        
!    } else if (argc==4)
       { /* no file name - I'm not first. */
         strcpy(my_gname,argv[1]);
         sscanf(argv[2],"%d",&my_port);