Changeset 80419f in git


Ignore:
Timestamp:
Oct 14, 1998, 12:18:56 PM (26 years ago)
Author:
Olaf Bachmann <obachman@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
853f818050f20b528be71053db48b5165ee1d730
Parents:
bba1c4693965775b38677bdcdf5a0e505b367031
Message:
1998-10-14  Olaf Bachmann  <obachman@mathematik.uni-kl.de>

	    * sing_mp.cc (slOpenMPLaunch): added slKill as link
              function
	      * added --MPrsh to slOpenLaunch


git-svn-id: file:///usr/local/Singular/svn/trunk@2563 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
Singular
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • Singular/ChangeLog

    rbba1c4 r80419f  
     11998-10-14  Olaf Bachmann  <obachman@mathematik.uni-kl.de>
     2
     3        * sing_mp.cc (slOpenMPLaunch): added slKill as link function
     4        * added --MPrsh to slOpenLaunch
     5
    16Wed Jul  1 15:25:23 MET DST 1998 hannes:
    27* fixed bug with quotient: M:module(0) returns (1), not ([1])

  • Singular/silink.cc

    rbba1c4 r80419f  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: silink.cc,v 1.22 1998-08-06 08:52:57 Singular Exp $ */
     4/* $Id: silink.cc,v 1.23 1998-10-14 10:18:54 obachman Exp $ */
    55
    66/*
    … …  
    106106  if (l->ref == 0)
    107107  {
    108     if (SI_LINK_OPEN_P(l)) slClose(l);
     108    if (SI_LINK_OPEN_P(l))
     109    {
     110      if (l->m->Kill != NULL) l->m->Kill(l);
     111      else if (l->m->Close != NULL) l->m->Close(l);
     112    }
    109113    FreeL((ADDRESS)l->name);
    110114    FreeL((ADDRESS)l->mode);
    … …  
    754758  si_link_root->Open=slOpenAscii;
    755759  si_link_root->Close=slCloseAscii;
     760  si_link_root->Kill=slCloseAscii;
    756761  si_link_root->Read=slReadAscii;
    757762  si_link_root->Write=slWriteAscii;

  • Singular/silink.h

    rbba1c4 r80419f  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: silink.h,v 1.9 1998-06-02 15:30:04 Singular Exp $ */
     6/* $Id: silink.h,v 1.10 1998-10-14 10:18:55 obachman Exp $ */
    77/*
    88* ABSTRACT: general interface to links
    … …  
    1515typedef BOOLEAN    (*slWriteProc)(si_link l, leftv lv);
    1616typedef BOOLEAN    (*slCloseProc)(si_link l);
     17typedef BOOLEAN    (*slKillProc)(si_link l);
    1718typedef leftv      (*slReadProc)(si_link l);
    1819typedef leftv      (*slRead2Proc)(si_link l, leftv a);
    … …  
    2627  slOpenProc       Open;
    2728  slCloseProc      Close;
     29  slKillProc       Kill;
    2830  slReadProc       Read;
    2931  slRead2Proc      Read2;

  • Singular/sing_dbm.cc

    rbba1c4 r80419f  
    55//**************************************************************************/
    66//
    7 // $Id: sing_dbm.cc,v 1.9 1998-04-08 16:04:32 Singular Exp $
     7// $Id: sing_dbm.cc,v 1.10 1998-10-14 10:18:55 obachman Exp $
    88//
    99//**************************************************************************/
    … …  
    208208  s->Open=dbOpen;
    209209  s->Close=dbClose;
     210  s->Kill=dbClose;
    210211  s->Read=dbRead1;
    211212  s->Read2=dbRead2;

  • Singular/sing_mp.cc

    rbba1c4 r80419f  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: sing_mp.cc,v 1.19 1998-06-13 12:44:48 krueger Exp $ */
     4/* $Id: sing_mp.cc,v 1.20 1998-10-14 10:18:56 obachman Exp $ */
    55
    66/*
    … …  
    210210{
    211211  char *argv[] = {"--MPtransp", "TCP", "--MPmode", "launch",
    212                   "--MPhost", "localhost",
     212                  "--MPhost", "localhost",  "--MPrsh", "rsh",
    213213                  "--MPapplication", "Singular -bq  --no-stdlib --no-rc"};
    214214  char *appl = IMP_GetCmdlineArg(n_argc, n_argv, "--MPapplication");
    215215  char *host = IMP_GetCmdlineArg(n_argc, n_argv, "--MPhost");
     216  char *rsh = IMP_GetCmdlineArg(n_argc, n_argv, "--MPrsh");
    216217  char* nappl = NULL;
    217218  MP_Link_pt link;
    … …  
    233234 
    234235  if (appl != NULL) 
    235     argv[7] = appl;
     236    argv[9] = appl;
    236237
    237238  if (host == NULL)
    … …  
    242243    argv[5] = host;
    243244
    244   link = MP_OpenLink(mp_Env, 8, argv);
     245  if (rsh != NULL)
     246  {
     247    argv[7] = rsh;
     248  }
     249
     250  link = MP_OpenLink(mp_Env, 10, argv);
    245251  if (nappl != NULL) Free(nappl, MAXPATHLEN + 24);
    246252  return link;
    … …  
    398404}
    399405
     406static BOOLEAN slKillMP(si_link l)
     407{
     408  MP_KillLink((MP_Link_pt) l->data);
     409  SI_LINK_SET_CLOSE_P(l);
     410  return FALSE;
     411}
    400412
    401413static BOOLEAN slDumpMP(si_link l)
    … …  
    543555  s->Open=slOpenMPFile;
    544556  s->Close=slCloseMP;
     557  s->Close=slKillMP;
    545558  s->Read=slReadMP;
    546559  //s->Read2=NULL;
    … …  
    556569  s->Open=slOpenMPTcp;
    557570  s->Close=slCloseMP;
     571  s->Kill=slKillMP;
    558572  s->Read=slReadMP;
    559573  //s->Read2=NULL;
Note: See TracChangeset for help on using the changeset viewer.