Index: README =================================================================== RCS file: /uusoc/res/impulse/users/map/cvsroot/ml-rsim/README,v retrieving revision 1.10 retrieving revision 1.11 diff --context -r1.10 -r1.11 *** README 2 Mar 2005 21:56:54 -0000 1.10 --- README 24 May 2005 21:52:49 -0000 1.11 *************** *** 1,4 **** ! ML-RSIM/Lamix Release 3/3/2005 Quick Installation: --- 1,4 ---- ! ML-RSIM/Lamix Release 5/25/2005 Quick Installation: *************** *** 14,20 **** cd bin/ make ! 4. Cleaning up before cvs commit cd bin/ make clobber cd .. --- 14,20 ---- cd bin/ make ! 4. Cleaning up cd bin/ make clobber cd .. Index: lamix/fs/kern_descrip.c =================================================================== RCS file: /uusoc/res/impulse/users/map/cvsroot/ml-rsim/lamix/fs/kern_descrip.c,v retrieving revision 1.2 retrieving revision 1.3 diff --context -r1.2 -r1.3 *** lamix/fs/kern_descrip.c 25 Oct 2002 20:24:30 -0000 1.2 --- lamix/fs/kern_descrip.c 24 May 2005 21:52:51 -0000 1.3 *************** *** 324,331 **** if (fd == (int)arg) return ((int)arg); - FILE_USE(fp); - if ((int)arg >= fdp->fd_nfiles) { if ((error = fdalloc(p, (int)arg, &i)) != 0) --- 324,329 ---- *************** *** 342,348 **** (void) fdrelease(p, (int)arg); } ! return(finishdup(p, fd, i)); /*---------------------------------------------------------------------*/ --- 340,346 ---- (void) fdrelease(p, (int)arg); } ! return(finishdup(p, fd, (int)arg)); /*---------------------------------------------------------------------*/ *************** *** 706,712 **** /* * Note: `old' is already used for us. */ - fp = fdp->fd_ofiles[old]; fdp->fd_ofiles[new] = fp; fdp->fd_ofileflags[new] = fdp->fd_ofileflags[old] &~ FD_CLOEXEC; --- 704,709 ---- Index: src/sim_main/stat.c =================================================================== RCS file: /uusoc/res/impulse/users/map/cvsroot/ml-rsim/src/sim_main/stat.c,v retrieving revision 1.6 retrieving revision 1.7 diff --context -r1.6 -r1.7 *** src/sim_main/stat.c 25 Oct 2002 20:25:22 -0000 1.6 --- src/sim_main/stat.c 24 May 2005 21:52:51 -0000 1.7 *************** *** 89,97 **** { STATREC *srptr; int i; - /* - int h, n; - */ double d; PSDELAY; --- 89,94 ---- *************** *** 121,157 **** { /* Histograms will be collected */ srptr->histspecial = (histflg == HISTSPECIAL); - /* - n = nbins; - h = highbin; - */ d = (double)(highbin - lowbin) / (double)nbins; i = (int)d; while (((double)rint(d) != d) || (!IsPowerOf2(i))) { - /* - if ((double)ToPowerOf2(i) * (double)nbins + (double)lowbin < (double)highbin * 1.5) - highbin++; - else - nbins++; */ highbin++; d = (double)(highbin - lowbin) / (double)nbins; i = (int)d; } - /* - if ((h != highbin) || (n != nbins)) - YS__warnmsg(node, - "StatRec \"%s\": Histogram bins don't compute to a power of two\n", - srname); - - if (nbins != n) - YS__logmsg(node, " Adjusted NBins from %i to %i\n", n, nbins); - if (highbin != h) - YS__logmsg(node, " Adjusted Highbin from %i to %i\n", h, highbin); - */ - srptr->bins = nbins+1; srptr->hist = (long long*)malloc((srptr->bins)*sizeof(long long)); --- 118,133 ---- *************** *** 255,261 **** } if (srptr->hist) /* Collect histograms */ ! srptr->hist[(v + srptr->hist_offset) >> srptr->hist_shift] += t; if (v > srptr->maxval) srptr->maxval = v; --- 231,240 ---- } if (srptr->hist) /* Collect histograms */ ! { ! if (v + srptr->hist_low <= srptr->hist_high) ! srptr->hist[(v + srptr->hist_offset) >> srptr->hist_shift] += t; ! } if (v > srptr->maxval) srptr->maxval = v; *************** *** 401,406 **** --- 380,391 ---- } else YS__statmsg(node, "All histogram entries = 0"); + + if (srptr->maxval+srptr->hist_low > srptr->hist_high) + YS__statmsg(node, + "Warning: maximum value exceeds histogram range (%i, %i)\n", + srptr->hist_low,srptr->hist_high); + } }