OpenXM_contrib2/asir2000/builtin/time.c - diff

Return to time.c CVS log

Up to [local] / OpenXM_contrib2 / asir2000 / builtin

Diff for /OpenXM_contrib2/asir2000/builtin/time.c between version 1.1.1.1 and 1.9

-version 1.1.1.1, 1999/12/03 07:39:07
+version 1.9, 2015/08/08 14:19:41
 Line 1
 Line 1
 Line 1
- /* $OpenXM: OpenXM/src/asir99/builtin/time.c,v 1.1.1.1 1999/11/10 08:12:26 noro Exp $ */
+ /*
+  * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED
+  * All rights reserved.
+  *
+  * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited,
+  * non-exclusive and royalty-free license to use, copy, modify and
+  * redistribute, solely for non-commercial and non-profit purposes, the
+  * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and
+  * conditions of this Agreement. For the avoidance of doubt, you acquire
+  * only a limited right to use the SOFTWARE hereunder, and FLL or any
+  * third party developer retains all rights, including but not limited to
+  * copyrights, in and to the SOFTWARE.
+  *
+  * (1) FLL does not grant you a license in any way for commercial
+  * purposes. You may use the SOFTWARE only for non-commercial and
+  * non-profit purposes only, such as academic, research and internal
+  * business use.
+  * (2) The SOFTWARE is protected by the Copyright Law of Japan and
+  * international copyright treaties. If you make copies of the SOFTWARE,
+  * with or without modification, as permitted hereunder, you shall affix
+  * to all such copies of the SOFTWARE the above copyright notice.
+  * (3) An explicit reference to this SOFTWARE and its copyright owner
+  * shall be made on your publication or presentation in any form of the
+  * results obtained by use of the SOFTWARE.
+  * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
+  * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
+  * for such modification or the source code of the modified part of the
+  * SOFTWARE.
+  *
+  * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL
+  * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND
+  * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
+  * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES'
+  * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY
+  * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY.
+  * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT,
+  * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY
+  * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+  * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES
+  * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES
+  * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY
+  * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF
+  * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART
+  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
+  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
+  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
+  *
+  * $OpenXM: OpenXM_contrib2/asir2000/builtin/time.c,v 1.8 2011/05/11 06:03:53 ohara Exp $
+ */
  #include "ca.h"
  #include "parse.h"
+ #include <limits.h>
  void Ptime(), Pcputime(), Pcurrenttime(), Ptstart(), Ptstop();
+ void Pdcurrenttime();
  struct ftab time_tab[] = {
          {"time",Ptime,0},
          {"cputime",Pcputime,1},
          {"currenttime",Pcurrenttime,0},
+         {"dcurrenttime",Pdcurrenttime,0},
          {"tstart",Ptstart,0},
          {"tstop",Ptstop,0},
          {0,0,0},
-Line 25  Q *rp;
+Line 76  Q *rp;
 Line 25  Q *rp;
 Line 76  Q *rp;
          t = (int)get_current_time(); STOQ(t,*rp);
  }
+ void Pdcurrenttime(rp)
+ Real *rp;
+ {
+         double t;
+         t = get_current_time(); MKReal(t,*rp);
+ }
  void Ptstart(rp)
  pointer *rp;
  {
-Line 55  LIST *listp;
+Line 114  LIST *listp;
 Line 55  LIST *listp;
 Line 114  LIST *listp;
          Real re,rg,rr;
          NODE a,b,w,r;
          Q words;
-         int t;
+         size_t t;
+         unsigned int u,l;
+         N n;
          double rtime;
          double get_rtime();
          rtime = get_rtime(); MKReal(rtime,rr);
-         t = get_allocwords(); STOQ(t,words);
+         t = get_allocwords();
+         if(sizeof(size_t)>sizeof(int)) {
+                 u = t>>(sizeof(int)*CHAR_BIT); l = t&(~0);
+                 if ( !u ) STOQ(l,words);
+                 else {
+                         n = NALLOC(2); PL(n)=2; BD(n)[0] = l; BD(n)[1] = u;
+                         NTOQ(n,1,words);
+                 }
+         }else {
+                 STOQ(t,words);
+         }
          get_eg(&eg); MKReal(eg.exectime,re); MKReal(eg.gctime,rg);
          MKNODE(r,rr,0); MKNODE(w,words,r); MKNODE(a,rg,w); MKNODE(b,re,a);
          MKLIST(*listp,b);
-Line 80  double r;
+Line 151  double r;
 Line 80  double r;
 Line 151  double r;
                  fprintf(stderr,"%.4gsec + gc : %.4gsec(%.4gsec)\n",e,g,r);
          else
                  fprintf(stderr,"%.4gsec(%.4gsec)\n",e,r);
+ #if defined(__MINGW32__) || defined(__MINGW64__)
+         fflush(stderr);
+ #endif
  }

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>