Changeset 13659
- Timestamp:
- 2007-01-17T11:58:03+13:00 (17 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl3/src/packages/mg/lib/bitio_m_random.h
r13654 r13659 53 53 register unsigned long __pos = 0; \ 54 54 register unsigned long __base = 0; \ 55 register unsigned long __ used = 0; \55 register unsigned long __is_used = 0; \ 56 56 register unsigned long __len = (l)-1; \ 57 57 register unsigned long __sft = 0; \ 58 while (__len) { __sft++; __len >>=1; } \58 while (__len) { ++__sft; __len >>=1; } \ 59 59 __len = 1<<__sft; \ 60 60 __buf = Xmalloc(__len); \ … … 68 68 register unsigned long __pos = (b).pos; \ 69 69 register unsigned long __base = (b).Base; \ 70 register unsigned long __ used = (b).Used; \70 register unsigned long __is_used = (b).Used; \ 71 71 register unsigned long __len = (b).len; \ 72 72 register unsigned long __sft = (b).sft; … … 74 74 #define SEEK fprintf(stderr, "Seek to %d\n",__base) 75 75 #define READ fprintf(stderr, "Read of %d\n",__len) 76 #define WRITE fprintf(stderr, "Write of %d\n",__ used)76 #define WRITE fprintf(stderr, "Write of %d\n",__is_used) 77 77 78 78 #define WRITE_READ \ 79 (__ used ? (fseek(__file, __base, 0), \79 (__is_used ? (fseek(__file, __base, 0), \ 80 80 fwrite(__buf, 1, __len, __file)) : 0, \ 81 81 __base += __len, \ 82 82 fseek(__file, __base, 0), \ 83 83 fread(__buf, 1, __len, __file), \ 84 __pos = 0, __ used = 0)84 __pos = 0, __is_used = 0) 85 85 86 86 #define ENCODE_BIT(b) \ … … 90 90 else \ 91 91 __buf[__pos>>3] &= 0xff7f >> (__pos&7); \ 92 __ used = 1; \93 __pos++; \92 __is_used = 1; \ 93 ++__pos; \ 94 94 if ((__pos>>3) >= __len) \ 95 95 (void)WRITE_READ; \ … … 101 101 (b).pos = __pos; \ 102 102 (b).Base = __base; \ 103 (b).Used = __ used; \103 (b).Used = __is_used; \ 104 104 (b).len = __len; \ 105 105 (b).sft = __sft; \ … … 107 107 108 108 #define ENCODE_FLUSH \ 109 if (__ used) \109 if (__is_used) \ 110 110 { \ 111 111 fseek(__file, __base, 0); \ 112 112 fwrite(__buf, 1, __len, __file); \ 113 __ used = 0; \113 __is_used = 0; \ 114 114 } 115 115 -
trunk/indexers/mg/lib/bitio_m_random.h
r13654 r13659 53 53 register unsigned long __pos = 0; \ 54 54 register unsigned long __base = 0; \ 55 register unsigned long __ used = 0; \55 register unsigned long __is_used = 0; \ 56 56 register unsigned long __len = (l)-1; \ 57 57 register unsigned long __sft = 0; \ 58 while (__len) { __sft++; __len >>=1; } \58 while (__len) { ++__sft; __len >>=1; } \ 59 59 __len = 1<<__sft; \ 60 60 __buf = Xmalloc(__len); \ … … 68 68 register unsigned long __pos = (b).pos; \ 69 69 register unsigned long __base = (b).Base; \ 70 register unsigned long __ used = (b).Used; \70 register unsigned long __is_used = (b).Used; \ 71 71 register unsigned long __len = (b).len; \ 72 72 register unsigned long __sft = (b).sft; … … 74 74 #define SEEK fprintf(stderr, "Seek to %d\n",__base) 75 75 #define READ fprintf(stderr, "Read of %d\n",__len) 76 #define WRITE fprintf(stderr, "Write of %d\n",__ used)76 #define WRITE fprintf(stderr, "Write of %d\n",__is_used) 77 77 78 78 #define WRITE_READ \ 79 (__ used ? (fseek(__file, __base, 0), \79 (__is_used ? (fseek(__file, __base, 0), \ 80 80 fwrite(__buf, 1, __len, __file)) : 0, \ 81 81 __base += __len, \ 82 82 fseek(__file, __base, 0), \ 83 83 fread(__buf, 1, __len, __file), \ 84 __pos = 0, __ used = 0)84 __pos = 0, __is_used = 0) 85 85 86 86 #define ENCODE_BIT(b) \ … … 90 90 else \ 91 91 __buf[__pos>>3] &= 0xff7f >> (__pos&7); \ 92 __ used = 1; \93 __pos++; \92 __is_used = 1; \ 93 ++__pos; \ 94 94 if ((__pos>>3) >= __len) \ 95 95 (void)WRITE_READ; \ … … 101 101 (b).pos = __pos; \ 102 102 (b).Base = __base; \ 103 (b).Used = __ used; \103 (b).Used = __is_used; \ 104 104 (b).len = __len; \ 105 105 (b).sft = __sft; \ … … 107 107 108 108 #define ENCODE_FLUSH \ 109 if (__ used) \109 if (__is_used) \ 110 110 { \ 111 111 fseek(__file, __base, 0); \ 112 112 fwrite(__buf, 1, __len, __file); \ 113 __ used = 0; \113 __is_used = 0; \ 114 114 } 115 115
Note:
See TracChangeset
for help on using the changeset viewer.