Changeset 018d957e in mainline

Timestamp:

2006-03-20T20:37:17Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

741ade3f

Parents:

53f9821

Message:

B+-tree implementation.
Currently supports only inserting and searching.

Files:

• Makefile (modified) (1 diff)
• generic/include/adt/btree.h (added)
• generic/include/typedefs.h (modified) (1 diff)
• generic/src/adt/btree.c (added)
• generic/src/main/main.c (modified) (3 diffs)
• kernel.config (modified) (1 diff)
• test/btree/btree1/test.c (added)

Makefile

@@ -101 +101 @@
 
 GENERIC_SOURCES = \
+        generic/src/adt/btree.c \
         generic/src/adt/hash_table.c \
         generic/src/adt/list.c \

generic/include/typedefs.h

@@ -90 +90 @@
 typedef struct hash_table_operations hash_table_operations_t;
 
+typedef struct btree_node btree_node_t;
+typedef struct btree btree_t;
+
 #endif

generic/src/main/main.c

@@ -163 +163 @@
          */     
         arch_pre_mm_init();
-        /* Initialize at least 1 memory segment big enough for slab to work */
-        frame_init();
+        frame_init();           /* Initialize at least 1 memory segment big enough for slab to work */
         slab_cache_init();
         as_init();
@@ -170 +169 @@
         tlb_init();
         arch_post_mm_init();    
+
         version_print();
-
         printf("%P: hardcoded_ktext_size=%dK, hardcoded_kdata_size=%dK\n",
                 config.base, hardcoded_ktext_size/1024, hardcoded_kdata_size/1024);
@@ -177 +176 @@
         arch_pre_smp_init();
         smp_init();
-        /* Slab must be initialized AFTER we know the number of processors */
-        slab_enable_cpucache();
+        
+        slab_enable_cpucache(); /* Slab must be initialized AFTER we know the number of processors */
 
         printf("config.memory_size=%dM\n", config.memory_size/(1024*1024));

kernel.config

@@ -82 +82 @@
 @ "" No test
 @ "atomic/atomic1" Test of atomic operations.
+@ "btree/btree1" B-tree test.
 @ "synch/rwlock1" Read write test 1
 @ "synch/rwlock2" Read write test 2