/branches/rcu/kernel/test/timeout/timeoutbench1.def |
---|
File deleted |
/branches/rcu/kernel/test/timeout/timeoutbench1.c |
---|
File deleted |
/branches/rcu/kernel/test/test.c |
---|
63,7 → 63,6 |
#include <extavltree/extavltree1.def> |
#include <extavlreltree/extavlreltree1.def> |
#include <timeout/timeout1.def> |
#include <timeout/timeoutbench1.def> |
{NULL, NULL, NULL} |
}; |
/branches/rcu/kernel/test/avltree/avltree1.c |
---|
31,7 → 31,9 |
#include <adt/avl.h> |
#include <debug.h> |
#include <panic.h> |
#define NODE_COUNT 100 |
/* |
160,14 → 162,12 |
//RL rotation |
avltree_nodes[13].key = 90; |
avltree_nodes[14].key = 85; |
//Insert 0 key |
avltree_nodes[15].key = 0; |
avltree_nodes[16].key = 0; |
//Insert reverse |
avltree_nodes[17].key = 600; |
avltree_nodes[18].key = 500; |
avltree_nodes[19].key = 400; |
avltree_nodes[20].key = 300; |
avltree_nodes[15].key = 100; |
avltree_nodes[16].key = 200; |
avltree_nodes[17].key = 300; |
avltree_nodes[18].key = 400; |
avltree_nodes[19].key = 500; |
avltree_nodes[20].key = 600; |
for (i = 21; i < NODE_COUNT; i++) |
avltree_nodes[i].key = i * 3; |
/branches/rcu/kernel/test/test.h |
---|
75,7 → 75,6 |
extern char * test_extavltree1(bool quiet); |
extern char * test_extavlreltree1(bool quiet); |
extern char * test_timeout1(bool quiet); |
extern char * test_timeoutbench1(bool quiet); |
extern test_t tests[]; |
/branches/rcu/kernel/generic/src/time/timeout.c |
---|
1,6 → 1,5 |
/* |
* Copyright (C) 2001-2004 Jakub Jermar |
* Copyright (C) 2007 Vojtech Mencl |
* All rights reserved. |
* |
* Redistribution and use in source and binary forms, with or without |
/branches/rcu/kernel/generic/src/adt/extavl.c |
---|
163,7 → 163,7 |
newnode->par = cur; |
gpa = cur; |
while ((gpa != &t->head) && (gpa->key == cur->key)) |
while (gpa != &t->head && gpa->key == cur->key) |
gpa = gpa->prev; |
newnode->next = gpa->next; |
newnode->prev = gpa; |
403,7 → 403,7 |
} |
if ((&t->head != node->prev) && (node->prev->key == node->key)) { |
if (&t->head != node->prev && node->prev->key == node->key) { |
/* |
* Deleted node has at least one node node with the same key which is closest previous |
* neighbor in the list, copy node atributes into previous node and end. |
747,11 → 747,6 |
expnode->par->lft = NULL; |
expnode->par->lft_height = 0; |
} |
} else if (expnode->next == &t->head) { |
/* |
* Special case of deleting last node with key equal 0. |
*/ |
t->root = NULL; |
} |
/* |
/branches/rcu/kernel/generic/src/adt/extavlrel.c |
---|
1017,11 → 1017,6 |
expnode->par->lft_height = 0; |
} |
nextnode->key += expnode->key; |
} else { |
/* |
* Delete last node in tree. |
*/ |
t->root = NULL; |
} |
/* |
/branches/rcu/kernel/Makefile |
---|
258,8 → 258,7 |
test/avltree/avltree1.c \ |
test/extavltree/extavltree1.c \ |
test/extavlreltree/extavlreltree1.c \ |
test/timeout/timeout1.c \ |
test/timeout/timeoutbench1.c |
test/timeout/timeout1.c |
endif |
## Experimental features |