Mailing List Archive

Author: creamyg
Date: 2008-09-07 13:16:58 -0700 (Sun, 07 Sep 2008)
New Revision: 3838

Modified:
trunk/c_src/KinoSearch/Index/MultiPostingList.c
trunk/c_src/KinoSearch/Index/MultiReader.c
trunk/c_src/KinoSearch/Index/PostingPool.c
trunk/c_src/KinoSearch/Index/PostingPoolQueue.c
trunk/c_src/KinoSearch/Index/PostingsWriter.c
trunk/c_src/KinoSearch/Index/SegLexCache.c
trunk/c_src/KinoSearch/Index/SegPostingList.c
trunk/c_src/KinoSearch/Index/Snapshot.c
trunk/c_src/KinoSearch/Obj.c
trunk/c_src/KinoSearch/Obj/FastObj.c
trunk/c_src/KinoSearch/Obj/Undefined.c
trunk/c_src/KinoSearch/Obj/VTable.c
trunk/c_src/KinoSearch/Posting/RawPosting.c
trunk/c_src/KinoSearch/Posting/ScorePosting.c
trunk/c_src/KinoSearch/Schema.c
trunk/c_src/KinoSearch/Search/HitCollector/TopDocCollector.c
trunk/c_src/KinoSearch/Search/ORScorer.c
trunk/c_src/KinoSearch/Store/CompoundFileWriter.c
trunk/c_src/KinoSearch/Store/FileDes.c
trunk/c_src/KinoSearch/Store/InStream.c
trunk/c_src/KinoSearch/Store/OutStream.c
trunk/c_src/KinoSearch/Test/Util/BBSortEx.c
trunk/c_src/KinoSearch/Test/Util/BBSortExRun.c
trunk/c_src/KinoSearch/Util/BitVector.c
trunk/c_src/KinoSearch/Util/Debug.c
trunk/c_src/KinoSearch/Util/Debug.h
trunk/c_src/KinoSearch/Util/Hash.c
trunk/c_src/KinoSearch/Util/MathUtils.c
trunk/c_src/KinoSearch/Util/MemManager.c
trunk/c_src/KinoSearch/Util/MemManager.h
trunk/c_src/KinoSearch/Util/Num.c
trunk/c_src/KinoSearch/Util/SortExternal.bp
trunk/c_src/KinoSearch/Util/SortExternal.c
trunk/c_src/KinoSearch/Util/StringHelper.c
Log:
Be more consistent about avoiding chy_ and kino_ prefixes in core C code
whenever possible.


Modified: trunk/c_src/KinoSearch/Index/MultiPostingList.c
===================================================================
--- trunk/c_src/KinoSearch/Index/MultiPostingList.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Index/MultiPostingList.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -4,6 +4,9 @@
#include "KinoSearch/Posting.h"
#include "KinoSearch/Index/SegReader.h"
#include "KinoSearch/Index/SegPostingList.h"
+#include "KinoSearch/Search/Compiler.h"
+#include "KinoSearch/Search/Similarity.h"
+#include "KinoSearch/Search/Scorer.h"
#include "KinoSearch/Util/I32Array.h"

MultiPostingList*
@@ -142,9 +145,9 @@
}
}

-struct kino_Scorer*
-MultiPList_make_scorer(MultiPostingList *self, struct kino_Similarity *sim,
- struct kino_Compiler *compiler)
+Scorer*
+MultiPList_make_scorer(MultiPostingList *self, Similarity *sim,
+ Compiler *compiler)
{
SegPostingList *plist = (SegPostingList*)VA_Fetch(self->sub_plists, 0);
Posting *posting = SegPList_Get_Posting(plist);

Modified: trunk/c_src/KinoSearch/Index/MultiReader.c
===================================================================
--- trunk/c_src/KinoSearch/Index/MultiReader.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Index/MultiReader.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -148,7 +148,7 @@

PostingList*
MultiReader_posting_list(MultiReader *self, const CharBuf *field,
- kino_Obj *target)
+ Obj *target)
{
Schema *schema = InvIndex_Get_Schema(self->invindex);
FieldSpec *fspec = Schema_Fetch_FSpec(schema, field);

Modified: trunk/c_src/KinoSearch/Index/PostingPool.c
===================================================================
--- trunk/c_src/KinoSearch/Index/PostingPool.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Index/PostingPool.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -29,7 +29,7 @@
const CharBuf *field_name, MemoryPool *mem_pool)
{
/* Init. */
- kino_SortExRun_init((SortExRun*)self);
+ SortExRun_init((SortExRun*)self);
self->lex_instream = NULL;
self->post_instream = NULL;
self->lex_start = U64_MAX;

Modified: trunk/c_src/KinoSearch/Index/PostingPoolQueue.c
===================================================================
--- trunk/c_src/KinoSearch/Index/PostingPoolQueue.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Index/PostingPoolQueue.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -29,7 +29,7 @@
: mem_thresh;

/* Init. */
- kino_SortEx_init((SortExternal*)self, DOESNT_MATTER,
+ SortEx_init((SortExternal*)self, DOESNT_MATTER,
PostPoolQ_compare_rawp);

/* Assign. */

Modified: trunk/c_src/KinoSearch/Index/PostingsWriter.c
===================================================================
--- trunk/c_src/KinoSearch/Index/PostingsWriter.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Index/PostingsWriter.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -44,7 +44,7 @@

PostingsWriter*
PostWriter_new(InvIndex *invindex, SegInfo *seg_info,
- LexWriter *lex_writer, chy_u32_t mem_thresh)
+ LexWriter *lex_writer, u32_t mem_thresh)
{
PostingsWriter *self
= (PostingsWriter*)CREATE(NULL, POSTINGSWRITER);
@@ -53,7 +53,7 @@

PostingsWriter*
PostWriter_init(PostingsWriter *self, InvIndex *invindex, SegInfo *seg_info,
- LexWriter *lex_writer, chy_u32_t mem_thresh)
+ LexWriter *lex_writer, u32_t mem_thresh)
{
Schema *schema = InvIndex_Get_Schema(invindex);
Folder *folder = InvIndex_Get_Folder(invindex);
@@ -234,11 +234,11 @@

/* Cache fetch method (violates OO principles, but we'll deal). */
if (OBJ_IS_A(raw_post_source, POSTINGPOOL)) {
- fetch = (fetcher_t)KINO_METHOD_PTR(raw_post_source->_, PostPool,
+ fetch = (fetcher_t)METHOD_PTR(raw_post_source->_, PostPool,
Fetch_From_RAM);
}
else if (OBJ_IS_A(raw_post_source, POSTINGPOOLQUEUE)) {
- fetch = (fetcher_t)KINO_METHOD_PTR(raw_post_source->_, PostPoolQ,
+ fetch = (fetcher_t)METHOD_PTR(raw_post_source->_, PostPoolQ,
Fetch);
}


Modified: trunk/c_src/KinoSearch/Index/SegLexCache.c
===================================================================
--- trunk/c_src/KinoSearch/Index/SegLexCache.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Index/SegLexCache.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -132,7 +132,7 @@
self->locked = false;
}

-kino_TermInfo*
+TermInfo*
SegLexCache_get_term_info(SegLexCache *self)
{
return self->tinfos[ self->tick ];

Modified: trunk/c_src/KinoSearch/Index/SegPostingList.c
===================================================================
--- trunk/c_src/KinoSearch/Index/SegPostingList.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Index/SegPostingList.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -12,6 +12,9 @@
#include "KinoSearch/Index/TermInfo.h"
#include "KinoSearch/Index/SegLexicon.h"
#include "KinoSearch/Index/LexReader.h"
+#include "KinoSearch/Search/Compiler.h"
+#include "KinoSearch/Search/Similarity.h"
+#include "KinoSearch/Search/Scorer.h"
#include "KinoSearch/Store/InStream.h"
#include "KinoSearch/Store/Folder.h"

@@ -274,9 +277,9 @@
}
}

-struct kino_Scorer*
-SegPList_make_scorer(SegPostingList *self, struct kino_Similarity *sim,
- struct kino_Compiler *compiler)
+Scorer*
+SegPList_make_scorer(SegPostingList *self, Similarity *sim,
+ Compiler *compiler)
{
return Post_Make_Scorer(self->posting, sim, (PostingList*)self, compiler);
}

Modified: trunk/c_src/KinoSearch/Index/Snapshot.c
===================================================================
--- trunk/c_src/KinoSearch/Index/Snapshot.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Index/Snapshot.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -112,7 +112,7 @@
else {
Hash *snap_data = (Hash*)Json_slurp_json(folder, real_filename);
Hash *fields, *segments;
- chy_i32_t format, skip_interval, index_interval;
+ i32_t format, skip_interval, index_interval;
CharBuf *field;
CharBuf *fspec_class;


Modified: trunk/c_src/KinoSearch/Obj/FastObj.c
===================================================================
--- trunk/c_src/KinoSearch/Obj/FastObj.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Obj/FastObj.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -16,7 +16,7 @@
FastObj_create(FastObj *invoker, const CharBuf *class_name,
VTable *vtable, size_t alloc_size)
{
- FastObj *self = (FastObj*)kino_MemMan_wrapped_calloc(alloc_size, 1);
+ FastObj *self = (FastObj*)MemMan_wrapped_calloc(alloc_size, 1);
UNUSED_VAR(invoker);

if ( class_name == NULL
@@ -31,7 +31,7 @@
}
self->ref.count = 1;

- KINO_IFDEF_DEBUG( kino_Debug_num_allocated++ );
+ IFDEF_DEBUG( Debug_num_allocated++ );

return self;
}
@@ -41,7 +41,7 @@
{
CharBuf *class_name = CB_deserialize(NULL, instream);
if (!self) {
- self = (FastObj*)CREATE(class_name, KINO_FASTOBJ);
+ self = (FastObj*)CREATE(class_name, FASTOBJ);
}
else {
if (!CB_Equals(class_name, (Obj*)self->_->name))
@@ -51,7 +51,7 @@
return (FastObj*)Obj_init((Obj*)self);
}

-chy_u32_t
+u32_t
FastObj_get_refcount(FastObj *self)
{
return self->ref.count;
@@ -73,7 +73,7 @@
FastObj_to_native(FastObj *self)
{
REFCOUNT_INC(self);
- return Obj_wrap((kino_Obj*)self);
+ return Obj_wrap((Obj*)self);
}

/* Copyright 2006-2008 Marvin Humphrey

Modified: trunk/c_src/KinoSearch/Obj/Undefined.c
===================================================================
--- trunk/c_src/KinoSearch/Obj/Undefined.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Obj/Undefined.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -1,4 +1,5 @@
#define KINO_USE_SHORT_NAMES
+#define CHY_USE_SHORT_NAMES

#include "KinoSearch/Obj/VTable.h"
#include "KinoSearch/Obj/Undefined.h"
@@ -6,7 +7,7 @@
static Undefined the_undef_object = { (VTable*)&UNDEFINED, {1} };
Undefined *UNDEF = &the_undef_object;

-chy_u32_t
+u32_t
Undefined_get_refcount(Undefined* self)
{
CHY_UNUSED_VAR(self);

Modified: trunk/c_src/KinoSearch/Obj/VTable.c
===================================================================
--- trunk/c_src/KinoSearch/Obj/VTable.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Obj/VTable.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -160,7 +160,7 @@
singleton->ref.count--;

/* Track globals to help hunt memory leaks. */
- IFDEF_DEBUG( kino_Debug_num_globals += 2; );
+ IFDEF_DEBUG( Debug_num_globals += 2; );
}

return singleton;
@@ -239,7 +239,7 @@
if (VTable_registry == NULL)
CONFESS("Attempt to remove '%o', but registry is NULL", name);
Hash_Delete(VTable_registry, name);
- IFDEF_DEBUG( kino_Debug_num_globals -= 2; );
+ IFDEF_DEBUG( Debug_num_globals -= 2; );
}

/* Copyright 2006-2008 Marvin Humphrey

Modified: trunk/c_src/KinoSearch/Obj.c
===================================================================
--- trunk/c_src/KinoSearch/Obj.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Obj.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -66,7 +66,7 @@
{
CharBuf *class_name = CB_deserialize(NULL, instream);
if (!self) {
- self = CREATE(class_name, KINO_OBJ);
+ self = CREATE(class_name, OBJ);
}
else {
if (!CB_Equals(class_name, (Obj*)self->_->name))

Modified: trunk/c_src/KinoSearch/Posting/RawPosting.c
===================================================================
--- trunk/c_src/KinoSearch/Posting/RawPosting.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Posting/RawPosting.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -6,8 +6,8 @@
#include "KinoSearch/Store/OutStream.h"
#include "KinoSearch/Util/StringHelper.h"

-RawPosting KINO_RAWPOSTING_BLANK = {
- (kino_VTable*)&RAWPOSTING,
+RawPosting RAWPOSTING_BLANK = {
+ (VTable*)&RAWPOSTING,
{0},
0, /* doc_num */
1, /* freq */
@@ -22,7 +22,7 @@
char *term_text, size_t term_text_len)
{
RawPosting *self = (RawPosting*)pre_allocated_memory;
- self->_ = (kino_VTable*)&RAWPOSTING;
+ self->_ = (VTable*)&RAWPOSTING;
self->ref.count = 1; /* never used */
self->doc_num = doc_num;
self->freq = freq;

Modified: trunk/c_src/KinoSearch/Posting/ScorePosting.c
===================================================================
--- trunk/c_src/KinoSearch/Posting/ScorePosting.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Posting/ScorePosting.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -7,9 +7,10 @@
#include "KinoSearch/Index/PostingPool.h"
#include "KinoSearch/Posting/RawPosting.h"
#include "KinoSearch/FieldSpec.h"
+#include "KinoSearch/Search/Compiler.h"
+#include "KinoSearch/Search/Scorer.h"
#include "KinoSearch/Search/Similarity.h"
#include "KinoSearch/Search/Tally.h"
-#include "KinoSearch/Search/Compiler.h"
#include "KinoSearch/Store/InStream.h"
#include "KinoSearch/Search/Similarity.h"
#include "KinoSearch/Util/MemoryPool.h"
@@ -193,8 +194,7 @@

ScorePostingScorer*
ScorePost_make_scorer(ScorePosting *self, Similarity *sim,
- struct kino_PostingList *plist,
- struct kino_Compiler *compiler)
+ PostingList *plist, Compiler *compiler)
{
ScorePostingScorer* scorer
= (ScorePostingScorer*)CREATE(NULL, SCOREPOSTINGSCORER);

Modified: trunk/c_src/KinoSearch/Schema.c
===================================================================
--- trunk/c_src/KinoSearch/Schema.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Schema.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -239,8 +239,8 @@
}
}

-chy_u32_t
-kino_Schema_num_fields(kino_Schema *self)
+u32_t
+Schema_num_fields(Schema *self)
{
return self->fspecs->size;
}

Modified: trunk/c_src/KinoSearch/Search/HitCollector/TopDocCollector.c
===================================================================
--- trunk/c_src/KinoSearch/Search/HitCollector/TopDocCollector.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Search/HitCollector/TopDocCollector.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -25,7 +25,7 @@
self->num_hits = num_hits;

/* Derive. */
- self->hit_q = kino_HitQ_new(num_hits);
+ self->hit_q = HitQ_new(num_hits);

return self;
}

Modified: trunk/c_src/KinoSearch/Search/ORScorer.c
===================================================================
--- trunk/c_src/KinoSearch/Search/ORScorer.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Search/ORScorer.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -80,7 +80,7 @@

do {
/* Attempt to advance past current doc. */
- i32_t top_doc_num = Kino_ScorerDocQ_Top_Next(q);
+ i32_t top_doc_num = ScorerDocQ_Top_Next(q);
if (!top_doc_num) {
if (!SCORERDOCQ_SIZE(q))
break; /* bail, no more to advance */

Modified: trunk/c_src/KinoSearch/Store/CompoundFileWriter.c
===================================================================
--- trunk/c_src/KinoSearch/Store/CompoundFileWriter.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Store/CompoundFileWriter.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -29,7 +29,7 @@
}

CompoundFileWriter*
-CFWriter_init(kino_CompoundFileWriter *self, Folder *folder,
+CFWriter_init(CompoundFileWriter *self, Folder *folder,
const CharBuf *seg_name)
{
self->folder = REFCOUNT_INC(folder);
@@ -109,7 +109,7 @@

/* Start metadata. */
Hash_Store_Str(metadata, "sub_files", 9, (Obj*)sub_files);
- Hash_Store_I64(metadata, "format", 6, (i64_t)KINO_COMPOUND_FILE_FORMAT);
+ Hash_Store_I64(metadata, "format", 6, (i64_t)COMPOUND_FILE_FORMAT);

/* Get an outstream. */
CB_Cat_Trusted_Str(outfilename, ".cf", 3);

Modified: trunk/c_src/KinoSearch/Store/FileDes.c
===================================================================
--- trunk/c_src/KinoSearch/Store/FileDes.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Store/FileDes.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -2,7 +2,7 @@

#include "KinoSearch/Store/FileDes.h"

-i32_t kino_FileDes_object_count = 0;
+i32_t FileDes_object_count = 0;

FileDes*
FileDes_init(FileDes *self, const CharBuf *path)

Modified: trunk/c_src/KinoSearch/Store/InStream.c
===================================================================
--- trunk/c_src/KinoSearch/Store/InStream.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Store/InStream.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -78,7 +78,7 @@

/* Wait to allocate buffer until it's needed. */
if (self->buf == NULL) {
- self->buf = MALLOCATE(KINO_IO_STREAM_BUF_SIZE, char);
+ self->buf = MALLOCATE(IO_STREAM_BUF_SIZE, char);
}

/* Add bytes read to file position, reset. */
@@ -163,7 +163,7 @@
len -= available;
self->buf_pos += available;
}
- if (len < KINO_IO_STREAM_BUF_SIZE) {
+ if (len < IO_STREAM_BUF_SIZE) {
refill(self);
if (self->buf_len < len) {
CONFESS("Read past EOF of %o (start: %u64"
@@ -326,8 +326,8 @@
= InStream_Reopen(self, self->filename, self->offset, self->len);

if (self->buf != NULL) {
- evil_twin->buf = MALLOCATE(KINO_IO_STREAM_BUF_SIZE, char);
- memcpy(evil_twin->buf, self->buf, KINO_IO_STREAM_BUF_SIZE);
+ evil_twin->buf = MALLOCATE(IO_STREAM_BUF_SIZE, char);
+ memcpy(evil_twin->buf, self->buf, IO_STREAM_BUF_SIZE);
}

return evil_twin;

Modified: trunk/c_src/KinoSearch/Store/OutStream.c
===================================================================
--- trunk/c_src/KinoSearch/Store/OutStream.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Store/OutStream.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -15,7 +15,7 @@
OutStream_init(OutStream *self, FileDes *file_des)
{
/* Init. */
- self->buf = MALLOCATE(KINO_IO_STREAM_BUF_SIZE, char);
+ self->buf = MALLOCATE(IO_STREAM_BUF_SIZE, char);
self->buf_start = 0;
self->buf_pos = 0;

@@ -39,7 +39,7 @@
void
OutStream_absorb(OutStream *self, InStream *instream)
{
- char buf[KINO_IO_STREAM_BUF_SIZE];
+ char buf[IO_STREAM_BUF_SIZE];
u64_t bytes_left = InStream_Length(instream);

while (bytes_left) {
@@ -81,14 +81,14 @@
OutStream_write_bytes(OutStream *self, const char *bytes, size_t len)
{
/* If this data is larger than the buffer size, flush and write. */
- if (len >= KINO_IO_STREAM_BUF_SIZE) {
+ if (len >= IO_STREAM_BUF_SIZE) {
OutStream_Flush(self);
if ( !FileDes_Write(self->file_des, bytes, len) )
CONFESS("Error: %o", FileDes_Get_Mess(self->file_des));
self->buf_start += len;
}
/* If there's not enough room in the buffer, flush then add. */
- else if (self->buf_pos + len >= KINO_IO_STREAM_BUF_SIZE) {
+ else if (self->buf_pos + len >= IO_STREAM_BUF_SIZE) {
OutStream_Flush(self);
memcpy((self->buf + self->buf_pos), bytes,
len * sizeof(char));
@@ -105,7 +105,7 @@
static INLINE void
write_u8(OutStream *self, u8_t aU8)
{
- if (self->buf_pos >= KINO_IO_STREAM_BUF_SIZE)
+ if (self->buf_pos >= IO_STREAM_BUF_SIZE)
OutStream_Flush(self);
self->buf[ self->buf_pos++ ] = (char)aU8;
}

Modified: trunk/c_src/KinoSearch/Test/Util/BBSortEx.c
===================================================================
--- trunk/c_src/KinoSearch/Test/Util/BBSortEx.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Test/Util/BBSortEx.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -13,7 +13,7 @@
BBSortEx*
BBSortEx_init(BBSortEx *self, u32_t mem_threshold)
{
- kino_SortEx_init((SortExternal*)self, mem_threshold,
+ SortEx_init((SortExternal*)self, mem_threshold,
BBSortEx_compare_bbs);
return self;
}
@@ -39,7 +39,7 @@
/* Sort, then create a new run. */
BBSortEx_Sort_Cache(self);
for (i = self->cache_tick; i < self->cache_max; i++) {
- kino_Obj *elem = self->cache[i];
+ Obj *elem = self->cache[i];
VA_Push(elems, elem);
REFCOUNT_DEC(elem);
}

Modified: trunk/c_src/KinoSearch/Test/Util/BBSortExRun.c
===================================================================
--- trunk/c_src/KinoSearch/Test/Util/BBSortExRun.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Test/Util/BBSortExRun.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -29,7 +29,7 @@
}

void
-BBSortExRun_set_mem_thresh(BBSortExRun *self, chy_u32_t mem_thresh)
+BBSortExRun_set_mem_thresh(BBSortExRun *self, u32_t mem_thresh)
{
self->mem_thresh = mem_thresh;
}

Modified: trunk/c_src/KinoSearch/Util/BitVector.c
===================================================================
--- trunk/c_src/KinoSearch/Util/BitVector.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Util/BitVector.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -8,7 +8,7 @@
#define BITVEC_GROW(self, num) \
do { \
if (num >= self->cap) \
- Kino_BitVec_Grow(self, num); \
+ BitVec_Grow(self, num); \
} while (0)

/* Shared subroutine for performing both OR and XOR ops.
@@ -85,7 +85,7 @@
u32_t byte_size = (u32_t)ceil(self->cap / 8.0);

/* Forbid inheritance. */
- if (self->_ != (kino_VTable*)&BITVECTOR)
+ if (self->_ != (VTable*)&BITVECTOR)
CONFESS("Attempt by %o to inherit BitVec_Clone", Obj_Get_Class_Name(self));

memcpy(evil_twin->bits, self->bits, byte_size * sizeof(u8_t));

Modified: trunk/c_src/KinoSearch/Util/Debug.c
===================================================================
--- trunk/c_src/KinoSearch/Util/Debug.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Util/Debug.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -1,12 +1,13 @@
#define KINO_USE_SHORT_NAMES
+#define CHY_USE_SHORT_NAMES

#include "KinoSearch/Util/Debug.h"

-chy_i32_t kino_Debug_num_allocated = 0;
-chy_i32_t kino_Debug_num_freed = 0;
-chy_i32_t kino_Debug_num_globals = 0;
+i32_t Debug_num_allocated = 0;
+i32_t Debug_num_freed = 0;
+i32_t Debug_num_globals = 0;

-#if KINO_DEBUG_ENABLED
+#if DEBUG_ENABLED

#include <stdarg.h>
#include <ctype.h>
@@ -23,7 +24,7 @@
static void
cache_debug_env_var(char *override)
{
- const char *debug_env = override ? override : getenv("KINO_DEBUG");
+ const char *debug_env = override ? override : getenv("DEBUG");
if (debug_env != NULL) {
size_t len = strlen(debug_env);
if (len > sizeof(env_cache_buf) - 1)
@@ -36,7 +37,7 @@
}

void
-kino_Debug_print_mess(const char *file, int line, const char *func,
+Debug_print_mess(const char *file, int line, const char *func,
const char *pat, ...)
{
va_list args;
@@ -48,7 +49,7 @@
}

int
-kino_Debug_debug_should_print(const char *path, const char *func)
+Debug_debug_should_print(const char *path, const char *func)
{
if (!env_cache_is_current)
cache_debug_env_var(NULL);
@@ -97,18 +98,18 @@
}

void
-kino_Debug_set_env_cache(char *override)
+Debug_set_env_cache(char *override)
{
cache_debug_env_var(override);
}

-#else /* KINO_DEBUG */
+#else /* DEBUG */

void
-kino_Debug_set_env_cache(char *override)
+Debug_set_env_cache(char *override)
{
(void)override;
}

-#endif /* KINO_DEBUG */
+#endif /* DEBUG */


Modified: trunk/c_src/KinoSearch/Util/Debug.h
===================================================================
--- trunk/c_src/KinoSearch/Util/Debug.h 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Util/Debug.h 2008-09-07 20:16:58 UTC (rev 3838)
@@ -120,8 +120,12 @@
#define IFDEF_DEBUG KINO_IFDEF_DEBUG
#define DEBUG KINO_DEBUG
#define ASSERT KINO_ASSERT
+ #define Debug_print_mess kino_Debug_print_mess
#define Debug_debug_should_print kino_Debug_debug_should_print
#define Debug_set_env_cache kino_Debug_set_env_cache
+ #define Debug_num_allocated kino_Debug_num_allocated
+ #define Debug_num_freed kino_Debug_num_freed
+ #define Debug_num_globals kino_Debug_num_globals
#endif

#endif /* H_KINO_DEBUG */

Modified: trunk/c_src/KinoSearch/Util/Hash.c
===================================================================
--- trunk/c_src/KinoSearch/Util/Hash.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Util/Hash.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -236,7 +236,7 @@
}

i64_t
-Hash_fetch_i64(kino_Hash *self, const char *key, size_t key_len)
+Hash_fetch_i64(Hash *self, const char *key, size_t key_len)
{
CharBuf *val;
ZombieCharBuf key_buf = ZCB_BLANK;

Modified: trunk/c_src/KinoSearch/Util/MathUtils.c
===================================================================
--- trunk/c_src/KinoSearch/Util/MathUtils.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Util/MathUtils.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -39,7 +39,7 @@
}

u32_t
-kino_Math_decode_c32(char **source_ptr)
+Math_decode_c32(char **source_ptr)
{
u32_t retval;
u8_t *source = (u8_t*)*source_ptr;

Modified: trunk/c_src/KinoSearch/Util/MemManager.c
===================================================================
--- trunk/c_src/KinoSearch/Util/MemManager.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Util/MemManager.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -1,9 +1,10 @@
#include <stdlib.h>
#include <stdio.h>
+#define KINO_USE_SHORT_NAMES
#include "KinoSearch/Util/MemManager.h"

void*
-kino_MemMan_wrapped_malloc(size_t count)
+MemMan_wrapped_malloc(size_t count)
{
void *pointer = malloc(count);
if (pointer == NULL && count != 0) {
@@ -14,7 +15,7 @@
}

void*
-kino_MemMan_wrapped_calloc(size_t count, size_t size)
+MemMan_wrapped_calloc(size_t count, size_t size)
{
void *pointer = calloc(count, size);
if (pointer == NULL && count != 0) {
@@ -25,7 +26,7 @@
}

void*
-kino_MemMan_wrapped_realloc(void *ptr, size_t size)
+MemMan_wrapped_realloc(void *ptr, size_t size)
{
void *pointer = realloc(ptr, size);
if (pointer == NULL && size != 0) {

Modified: trunk/c_src/KinoSearch/Util/MemManager.h
===================================================================
--- trunk/c_src/KinoSearch/Util/MemManager.h 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Util/MemManager.h 2008-09-07 20:16:58 UTC (rev 3838)
@@ -27,6 +27,9 @@
(t*)kino_MemMan_wrapped_realloc((v), (n)*sizeof(t))

#ifdef KINO_USE_SHORT_NAMES
+ #define MemMan_wrapped_malloc kino_MemMan_wrapped_malloc
+ #define MemMan_wrapped_calloc kino_MemMan_wrapped_calloc
+ #define MemMan_wrapped_realloc kino_MemMan_wrapped_realloc
#define MALLOCATE(n,t) KINO_MALLOCATE(n,t)
#define CALLOCATE(n,t) KINO_CALLOCATE(n,t)
#define REALLOCATE(v,n,t) KINO_REALLOCATE(v,n,t)

Modified: trunk/c_src/KinoSearch/Util/Num.c
===================================================================
--- trunk/c_src/KinoSearch/Util/Num.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Util/Num.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -1,4 +1,5 @@
#define KINO_USE_SHORT_NAMES
+#define CHY_USE_SHORT_NAMES

#include "KinoSearch/Util/Num.h"

@@ -16,7 +17,7 @@
return self;
}

-chy_bool_t
+bool_t
Num_equals(Num *self, Obj *other)
{
Num *evil_twin = (Num*)other;

Modified: trunk/c_src/KinoSearch/Util/SortExternal.bp
===================================================================
--- trunk/c_src/KinoSearch/Util/SortExternal.bp 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Util/SortExternal.bp 2008-09-07 20:16:58 UTC (rev 3838)
@@ -6,6 +6,9 @@
#include "KinoSearch/Util/MSort.h"

#define KINO_SORTEX_DEFAULT_MEM_THRESHOLD 0x1000000
+#ifdef KINO_USE_SHORT_NAMES
+ #define SORTEX_DEFAULT_MEM_THRESHOLD KINO_SORTEX_DEFAULT_MEM_THRESHOLD
+#endif
__END_C__

/** External sorter.

Modified: trunk/c_src/KinoSearch/Util/SortExternal.c
===================================================================
--- trunk/c_src/KinoSearch/Util/SortExternal.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Util/SortExternal.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -50,7 +50,7 @@
/* Assign. */
self->compare = compare;
self->mem_thresh = mem_thresh == 0
- ? KINO_SORTEX_DEFAULT_MEM_THRESHOLD
+ ? SORTEX_DEFAULT_MEM_THRESHOLD
: mem_thresh;

ABSTRACT_CLASS_CHECK(self, SORTEXTERNAL);

Modified: trunk/c_src/KinoSearch/Util/StringHelper.c
===================================================================
--- trunk/c_src/KinoSearch/Util/StringHelper.c 2008-09-07 15:35:32 UTC (rev 3837)
+++ trunk/c_src/KinoSearch/Util/StringHelper.c 2008-09-07 20:16:58 UTC (rev 3838)
@@ -117,7 +117,7 @@
static const char base36_chars[] = "0123456789abcdefghijklmnopqrstuvwxyz";

CharBuf*
-StrHelp_to_base36(chy_u32_t num)
+StrHelp_to_base36(u32_t num)
{
char buffer[11];
char *buf = buffer + 10;


_______________________________________________
kinosearch-commits mailing list
kinosearch-commits@rectangular.com
http://www.rectangular.com/mailman/listinfo/kinosearch-commits