Changeset 1032 for 1.8.3/trunk/src/comp_h.c

Timestamp:

07/08/07 20:50:12 (1 year ago)

Author:

shawnw

Message:

Merged 1.8.3p4 into trunk

Files:

• 1.8.3/trunk/src/comp_h.c (modified) (6 diffs)

1.8.3/trunk/src/comp_h.c

@@ -54 +54 @@
-static CType ctable[TABLE_SIZE];
-static char ltable[TABLE_SIZE];
+
+slab *huffman_slab = NULL;
-
-static int fix_tree_depth(CNode *node, int height, int zeros);
@@ -260 +262 @@
-      add_ones(node->right);
-    if ((count >= 7) || ((count >= 3) && !node->left && !node->right)) {
-(CNode *) malloc((unsigned) sizeof(CNode)
+slab_malloc(huffman_slab, node
-      if (!ctop) {
-        do_rawlog(LT_ERR,
@@ -337 +339 @@
-#endif
-
+  huffman_slab = slab_create("huffman attribute compression", sizeof(CNode));
+  slab_set_opt(huffman_slab, SLAB_ALLOC_BEST_FIT, 1);
+
-  /* Part 1: initialize */
-  for (total = 0; total < TABLE_SIZE; total++) {
-    table[total].freq = 0;
-(CNode *) malloc((unsigned) sizeof(CNode)
+slab_malloc(huffman_slab, NULL
-    if (!table[total].node) {
-      do_rawlog(LT_ERR,
@@ -435 +440 @@
-    printf("\n");
-#endif
-(CNode *) malloc((unsigned) sizeof(CNode)
+slab_malloc(huffman_slab, table[indx].node
-    if (!node) {
-      do_rawlog(LT_ERR,
@@ -485 +490 @@
-  for (count = 0; node->left && (count < 4); count++)
-    node = node->left;
-(CNode *) malloc((unsigned) sizeof(CNode)
+slab_malloc(huffman_slab, node
-  if (!ctop) {
-    do_rawlog(LT_ERR, "Cannot allocate memory for compression tree. Aborting.");
@@ -509 +514 @@
-  for (count = 0; count < 8; count++) {
-    if (!node->left) {
-(CNode *) malloc((unsigned) sizeof(CNode)
+slab_malloc(huffman_slab, node
-      if (!ctop) {
-        do_rawlog(LT_ERR,