ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/util/rcollate.c
Revision 2.46 - (view) (download) (annotate) - [select for diffs]
Wed Jun 5 21:56:53 2024 UTC (4 months, 3 weeks ago) by greg
Branch: MAIN
CVS Tags: HEAD
Changes since 2.45: +2 -2 lines
Diff to previous 2.45 , to selected 2.33
perf(getinfo,rcollate): Removed unnecessary call to fileno() that used semaphore

Revision 2.45 - (view) (download) (annotate) - [select for diffs]
Fri Jan 26 00:47:17 2024 UTC (9 months ago) by greg
Branch: MAIN
Changes since 2.44: +3 -3 lines
Diff to previous 2.44 , to selected 2.33
feat(rcollate): Made -c option override new -fbN behavior

Revision 2.44 - (view) (download) (annotate) - [select for diffs]
Thu Jan 25 19:25:50 2024 UTC (9 months ago) by greg
Branch: MAIN
Changes since 2.43: +6 -1 lines
Diff to previous 2.43 , to selected 2.33
feat(rcollate): Made -fbN where N>1 to specify exact input record size

Revision 2.43 - (view) (download) (annotate) - [select for diffs]
Thu Mar 17 01:23:16 2022 UTC (2 years, 7 months ago) by greg
Branch: MAIN
CVS Tags: rad5R4
Changes since 2.42: +7 -9 lines
Diff to previous 2.42 , to selected 2.33
refactor(rcollate): Minor logic simplification

Revision 2.42 - (view) (download) (annotate) - [select for diffs]
Wed Mar 16 19:25:25 2022 UTC (2 years, 7 months ago) by greg
Branch: MAIN
Changes since 2.41: +75 -49 lines
Diff to previous 2.41 , to selected 2.33
perf(rcollate): Improved checks and added default -oc setting to # input columns

Revision 2.41 - (view) (download) (annotate) - [select for diffs]
Wed Mar 16 18:01:47 2022 UTC (2 years, 7 months ago) by greg
Branch: MAIN
Changes since 2.40: +6 -7 lines
Diff to previous 2.40 , to selected 2.33
refactor(rcollate): A few minor changes that should not affect performance

Revision 2.40 - (view) (download) (annotate) - [select for diffs]
Wed Mar 16 17:36:45 2022 UTC (2 years, 7 months ago) by greg
Branch: MAIN
Changes since 2.39: +49 -25 lines
Diff to previous 2.39 , to selected 2.33
feat(rcollate): Added formatting check for ASCII input with -c option

Revision 2.39 - (view) (download) (annotate) - [select for diffs]
Thu Mar 3 03:55:13 2022 UTC (2 years, 8 months ago) by greg
Branch: MAIN
Changes since 2.38: +3 -2 lines
Diff to previous 2.38 , to selected 2.33
feat: Added float and double alignment to i/o routines for future mmap() use

Revision 2.38 - (view) (download) (annotate) - [select for diffs]
Thu Jan 20 17:35:03 2022 UTC (2 years, 9 months ago) by greg
Branch: MAIN
Changes since 2.37: +7 -7 lines
Diff to previous 2.37 , to selected 2.33
refactor(rcollate): eliminated load_file() completely for Windows

Revision 2.37 - (view) (download) (annotate) - [select for diffs]
Fri Jan 15 17:22:23 2021 UTC (3 years, 9 months ago) by greg
Branch: MAIN
Changes since 2.36: +15 -15 lines
Diff to previous 2.36 , to selected 2.33
fix: fixed a few other bugs related to 64-bit addressing

Revision 2.36 - (view) (download) (annotate) - [select for diffs]
Mon Sep 7 17:08:08 2020 UTC (4 years, 1 month ago) by greg
Branch: MAIN
Changes since 2.35: +28 -15 lines
Diff to previous 2.35 , to selected 2.33
feat(rcollate): Added -c option to force operation with checks.

Revision 2.35 - (view) (download) (annotate) - [select for diffs]
Sat Dec 28 18:05:14 2019 UTC (4 years, 10 months ago) by greg
Branch: MAIN
CVS Tags: rad5R3
Changes since 2.34: +1 -2 lines
Diff to previous 2.34 , to selected 2.33
Removed redundant include files

Revision 2.34 - (view) (download) (annotate) - [select for diffs]
Fri Nov 8 22:12:33 2019 UTC (4 years, 11 months ago) by greg
Branch: MAIN
Changes since 2.33: +6 -5 lines
Diff to previous 2.33
Bug fixes in -o option

Revision 2.33 - (view) (download) (annotate) - [selected]
Fri Nov 8 16:36:36 2019 UTC (4 years, 11 months ago) by greg
Branch: MAIN
Changes since 2.32: +17 -3 lines
Diff to previous 2.32
Additional size checks

Revision 2.32 - (view) (download) (annotate) - [select for diffs]
Fri Nov 8 05:39:05 2019 UTC (4 years, 11 months ago) by greg
Branch: MAIN
Changes since 2.31: +2 -9 lines
Diff to previous 2.31 , to selected 2.33
Fixing minor issues with new -o code

Revision 2.31 - (view) (download) (annotate) - [select for diffs]
Fri Nov 8 02:10:38 2019 UTC (4 years, 11 months ago) by greg
Branch: MAIN
Changes since 2.30: +115 -22 lines
Diff to previous 2.30 , to selected 2.33
Added capability to rcollate for reblocking input order for tensors

Revision 2.30 - (view) (download) (annotate) - [select for diffs]
Tue Feb 5 17:13:00 2019 UTC (5 years, 8 months ago) by greg
Branch: MAIN
Changes since 2.29: +4 -2 lines
Diff to previous 2.29 , to selected 2.33
Added missing header opening line for -hi option

Revision 2.29 - (view) (download) (annotate) - [select for diffs]
Sat Oct 20 15:02:51 2018 UTC (6 years ago) by greg
Branch: MAIN
Changes since 2.28: +10 -10 lines
Diff to previous 2.28 , to selected 2.33
Fixed issue with unmapping mapped memory

Revision 2.28 - (view) (download) (annotate) - [select for diffs]
Fri Oct 19 16:53:37 2018 UTC (6 years ago) by greg
Branch: MAIN
Changes since 2.27: +9 -9 lines
Diff to previous 2.27 , to selected 2.33
Minor tweaks on last change

Revision 2.27 - (view) (download) (annotate) - [select for diffs]
Thu Oct 18 22:59:48 2018 UTC (6 years ago) by greg
Branch: MAIN
Changes since 2.26: +14 -7 lines
Diff to previous 2.26 , to selected 2.33
Fixed issues with very large file i/o

Revision 2.26 - (view) (download) (annotate) - [select for diffs]
Thu Aug 2 18:33:50 2018 UTC (6 years, 3 months ago) by greg
Branch: MAIN
CVS Tags: rad5R2
Changes since 2.25: +2 -2 lines
Diff to previous 2.25 , to selected 2.33
Created MAXFMTLEN to guard against buffer overrun attacks in header input

Revision 2.25 - (view) (download) (annotate) - [select for diffs]
Thu Aug 18 00:52:48 2016 UTC (8 years, 2 months ago) by greg
Branch: MAIN
CVS Tags: rad5R1
Changes since 2.24: +3 -3 lines
Diff to previous 2.24 , to selected 2.33
Switched over to more efficient fread/fwrite replacements getbinary/putbinary

Revision 2.24 - (view) (download) (annotate) - [select for diffs]
Sat Apr 16 00:42:16 2016 UTC (8 years, 6 months ago) by greg
Branch: MAIN
Changes since 2.23: +11 -2 lines
Diff to previous 2.23 , to selected 2.33
Made memory allocation in index_records less greedy

Revision 2.23 - (view) (download) (annotate) - [select for diffs]
Sun Mar 6 01:13:18 2016 UTC (8 years, 7 months ago) by schorsch
Branch: MAIN
Changes since 2.22: +9 -8 lines
Diff to previous 2.22 , to selected 2.33
Prepare for SCons build on Win32 and Win64

Revision 2.22 - (view) (download) (annotate) - [select for diffs]
Fri Mar 4 00:21:21 2016 UTC (8 years, 8 months ago) by greg
Branch: MAIN
Changes since 2.21: +1 -8 lines
Diff to previous 2.21 , to selected 2.33
Eliminated redundant #define's for getc and putc

Revision 2.21 - (view) (download) (annotate) - [select for diffs]
Tue Jun 16 20:35:56 2015 UTC (9 years, 4 months ago) by greg
Branch: MAIN
CVS Tags: rad5R0
Changes since 2.20: +2 -2 lines
Diff to previous 2.20 , to selected 2.33
Fixed bug in allocation for reading from stream

Revision 2.20 - (view) (download) (annotate) - [select for diffs]
Tue Jun 16 19:06:29 2015 UTC (9 years, 4 months ago) by greg
Branch: MAIN
Changes since 2.19: +39 -36 lines
Diff to previous 2.19 , to selected 2.33
Work-around fix for transposing ASCII input files under Windows

Revision 2.19 - (view) (download) (annotate) - [select for diffs]
Thu Sep 18 00:12:42 2014 UTC (10 years, 1 month ago) by greg
Branch: MAIN
CVS Tags: rad4R2P2
Changes since 2.18: +6 -9 lines
Diff to previous 2.18 , to selected 2.33
Simplified code a bit -- no significant change in behavior expected

Revision 2.18 - (view) (download) (annotate) - [select for diffs]
Fri Aug 1 18:21:04 2014 UTC (10 years, 3 months ago) by greg
Branch: MAIN
CVS Tags: rad4R2P1
Changes since 2.17: +2 -2 lines
Diff to previous 2.17 , to selected 2.33
Fixed issue with failure to manipulate header

Revision 2.17 - (view) (download) (annotate) - [select for diffs]
Thu Jul 24 16:28:17 2014 UTC (10 years, 3 months ago) by greg
Branch: MAIN
CVS Tags: rad4R2
Changes since 2.16: +6 -3 lines
Diff to previous 2.16 , to selected 2.33
Made NROWS/NCOLS more consistent with resolution string

Revision 2.16 - (view) (download) (annotate) - [select for diffs]
Wed Jul 9 21:45:48 2014 UTC (10 years, 3 months ago) by greg
Branch: MAIN
Changes since 2.15: +12 -9 lines
Diff to previous 2.15 , to selected 2.33
Fixed redundant header output (bug)

Revision 2.15 - (view) (download) (annotate) - [select for diffs]
Tue Jul 8 16:39:41 2014 UTC (10 years, 3 months ago) by greg
Branch: MAIN
Changes since 2.14: +2 -2 lines
Diff to previous 2.14 , to selected 2.33
Removed unnecessary address operators from function ids.

Revision 2.14 - (view) (download) (annotate) - [select for diffs]
Sat May 31 19:21:21 2014 UTC (10 years, 5 months ago) by greg
Branch: MAIN
Changes since 2.13: +27 -26 lines
Diff to previous 2.13 , to selected 2.33
Bug fixes

Revision 2.13 - (view) (download) (annotate) - [select for diffs]
Fri May 30 18:24:06 2014 UTC (10 years, 5 months ago) by greg
Branch: MAIN
Changes since 2.12: +4 -4 lines
Diff to previous 2.12 , to selected 2.33
Fixed bug when header is being removed from input

Revision 2.12 - (view) (download) (annotate) - [select for diffs]
Fri May 30 18:10:20 2014 UTC (10 years, 5 months ago) by greg
Branch: MAIN
Changes since 2.11: +4 -6 lines
Diff to previous 2.11 , to selected 2.33
Fixed issue with binary data when adding or removing header

Revision 2.11 - (view) (download) (annotate) - [select for diffs]
Fri May 30 17:29:28 2014 UTC (10 years, 5 months ago) by greg
Branch: MAIN
Changes since 2.10: +11 -5 lines
Diff to previous 2.10 , to selected 2.33
Added check for unsupported formats

Revision 2.10 - (view) (download) (annotate) - [select for diffs]
Fri May 30 16:50:43 2014 UTC (10 years, 5 months ago) by greg
Branch: MAIN
Changes since 2.9: +23 -8 lines
Diff to previous 2.9 , to selected 2.33
Added -hi and -ho options to control input and output headers separately

Revision 2.9 - (view) (download) (annotate) - [select for diffs]
Fri May 30 00:00:54 2014 UTC (10 years, 5 months ago) by greg
Branch: MAIN
Changes since 2.8: +88 -25 lines
Diff to previous 2.8 , to selected 2.33
Added NROWS, NCOLS and NCOMP to matrix headers

Revision 2.8 - (view) (download) (annotate) - [select for diffs]
Fri Feb 21 13:49:00 2014 UTC (10 years, 8 months ago) by greg
Branch: MAIN
Changes since 2.7: +8 -4 lines
Diff to previous 2.7 , to selected 2.33
Reduced number of calls to realloc() when loading from stdin

Revision 2.7 - (view) (download) (annotate) - [select for diffs]
Mon Nov 18 22:02:12 2013 UTC (10 years, 11 months ago) by greg
Branch: MAIN
Changes since 2.6: +7 -2 lines
Diff to previous 2.6 , to selected 2.33
More Windows fixes (someone should come up with an acrylic version of Windows)

Revision 2.6 - (view) (download) (annotate) - [select for diffs]
Mon Nov 18 18:07:16 2013 UTC (10 years, 11 months ago) by greg
Branch: MAIN
Changes since 2.5: +1 -2 lines
Diff to previous 2.5 , to selected 2.33
Fixes for Windows

Revision 2.5 - (view) (download) (annotate) - [select for diffs]
Fri Sep 6 21:43:29 2013 UTC (11 years, 1 month ago) by greg
Branch: MAIN
Changes since 2.4: +6 -5 lines
Diff to previous 2.4 , to selected 2.33
Propogate output dimensions to input dimensions before checking input data

Revision 2.4 - (view) (download) (annotate) - [select for diffs]
Fri Sep 6 21:34:39 2013 UTC (11 years, 1 month ago) by greg
Branch: MAIN
Changes since 2.3: +12 -6 lines
Diff to previous 2.3 , to selected 2.33
Added -w option to turn off warnings

Revision 2.3 - (view) (download) (annotate) - [select for diffs]
Thu Sep 5 18:47:12 2013 UTC (11 years, 1 month ago) by greg
Branch: MAIN
Changes since 2.2: +8 -3 lines
Diff to previous 2.2 , to selected 2.33
Added error check for too little input data

Revision 2.2 - (view) (download) (annotate) - [select for diffs]
Thu Sep 5 18:30:58 2013 UTC (11 years, 1 month ago) by greg
Branch: MAIN
Changes since 2.1: +2 -3 lines
Diff to previous 2.1 , to selected 2.33
Took off write ability I didn't need when mapping input file

Revision 2.1 - (view) (download) (annotate) - [select for diffs]
Thu Sep 5 17:53:23 2013 UTC (11 years, 1 month ago) by greg
Branch: MAIN
Diff to selected 2.33
Created rcollate command to support 5-phase method

Convenience Links

Links to HEAD: (view) (download) (annotate) Links to HEAD: (view) (download) (annotate)

Compare Revisions

This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, select a symbolic revision name using the selection box, or choose 'Use Text Field' and enter a numeric revision.

  Diffs between and
  Type of Diff should be a