Sfoglia il codice sorgente

src: remove hashtable implementations which are no longer used. we use now the common/uthash.h implementation

Nathalie Furmento 13 anni fa
parent
commit
17ed921472

+ 0 - 6
src/Makefile.am

@@ -57,7 +57,6 @@ noinst_HEADERS = 						\
 	core/dependencies/data_concurrency.h			\
 	core/dependencies/cg.h					\
 	core/dependencies/tags.h				\
-	core/dependencies/htable.h				\
 	core/dependencies/implicit_data_deps.h			\
 	core/sched_policy.h					\
 	core/perfmodel/perfmodel.h				\
@@ -89,8 +88,6 @@ noinst_HEADERS = 						\
 	datawizard/interfaces/data_interface.h			\
 	common/barrier.h					\
 	common/timing.h						\
-	common/htable32.h					\
-	common/htable64.h					\
 	common/list.h						\
 	common/rwlock.h						\
 	common/starpu_spinlock.h				\
@@ -119,8 +116,6 @@ noinst_HEADERS = 						\
 libstarpu_@STARPU_EFFECTIVE_VERSION@_la_SOURCES = 						\
 	common/barrier.c					\
 	common/hash.c 						\
-	common/htable32.c					\
-	common/htable64.c					\
 	common/rwlock.c						\
 	common/starpu_spinlock.c				\
 	common/timing.c						\
@@ -140,7 +135,6 @@ libstarpu_@STARPU_EFFECTIVE_VERSION@_la_SOURCES = 						\
 	core/dependencies/implicit_data_deps.c			\
 	core/dependencies/tags.c				\
 	core/dependencies/task_deps.c				\
-	core/dependencies/htable.c				\
 	core/dependencies/data_concurrency.c			\
 	core/perfmodel/perfmodel_history.c			\
 	core/perfmodel/perfmodel_bus.c				\

+ 0 - 130
src/common/htable32.c

@@ -1,130 +0,0 @@
-/* StarPU --- Runtime system for heterogeneous multicore architectures.
- *
- * Copyright (C) 2009-2010, 2012  Université de Bordeaux 1
- * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
- *
- * StarPU is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * StarPU is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * See the GNU Lesser General Public License in COPYING.LGPL for more details.
- */
-
-#include <starpu.h>
-#include <common/config.h>
-#include <common/htable32.h>
-#include <stdint.h>
-#include <string.h>
-
-void *_starpu_htbl_search_32(struct starpu_htbl32_node *htbl, uint32_t key)
-{
-	unsigned currentbit;
-	unsigned keysize = sizeof(uint32_t)*8;
-
-	struct starpu_htbl32_node *current_htbl = htbl;
-
-	/* 000000000001111 with HTBL_NODE_SIZE 1's */
-	uint32_t mask = (1<<_STARPU_HTBL32_NODE_SIZE)-1;
-
-	for(currentbit = 0; currentbit < keysize; currentbit+=_STARPU_HTBL32_NODE_SIZE)
-	{
-		//	printf("search : current bit = %d \n", currentbit);
-		if (STARPU_UNLIKELY(current_htbl == NULL))
-			return NULL;
-
-		/* 0000000000001111
-		 *     | currentbit
-		 * 0000111100000000 = offloaded_mask
-		 *         |last_currentbit
-		 * */
-
-		unsigned last_currentbit =
-			keysize - (currentbit + _STARPU_HTBL32_NODE_SIZE);
-		uint32_t offloaded_mask = mask << last_currentbit;
-		unsigned current_index =
-			(key & (offloaded_mask)) >> (last_currentbit);
-
-		current_htbl = current_htbl->children[current_index];
-	}
-
-	return current_htbl;
-}
-
-/*
- * returns the previous value of the tag, or NULL else
- */
-
-void *_starpu_htbl_insert_32(struct starpu_htbl32_node **htbl, uint32_t key, void *entry)
-{
-	unsigned currentbit;
-	unsigned keysize = sizeof(uint32_t)*8;
-
-	struct starpu_htbl32_node **current_htbl_ptr = htbl;
-
-	/* 000000000001111 with HTBL_NODE_SIZE 1's */
-	uint32_t mask = (1<<_STARPU_HTBL32_NODE_SIZE)-1;
-
-	for(currentbit = 0; currentbit < keysize; currentbit+=_STARPU_HTBL32_NODE_SIZE)
-	{
-		//printf("insert : current bit = %d \n", currentbit);
-		if (*current_htbl_ptr == NULL)
-		{
-			/* TODO pad to change that 1 into 16 ? */
-			*current_htbl_ptr = (struct starpu_htbl32_node*)calloc(sizeof(struct starpu_htbl32_node), 1);
-			STARPU_ASSERT(*current_htbl_ptr);
-		}
-
-		/* 0000000000001111
-		 *     | currentbit
-		 * 0000111100000000 = offloaded_mask
-		 *         |last_currentbit
-		 * */
-
-		unsigned last_currentbit =
-			keysize - (currentbit + _STARPU_HTBL32_NODE_SIZE);
-		uint32_t offloaded_mask = mask << last_currentbit;
-		unsigned current_index =
-			(key & (offloaded_mask)) >> (last_currentbit);
-
-		current_htbl_ptr =
-			&((*current_htbl_ptr)->children[current_index]);
-	}
-
-	/* current_htbl either contains NULL or a previous entry
-	 * we overwrite it anyway */
-	void *old_entry = *current_htbl_ptr;
-	*current_htbl_ptr = (struct starpu_htbl32_node *) entry;
-
-	return old_entry;
-}
-
-static void _starpu_htbl_destroy_32_bit(struct starpu_htbl32_node *htbl, unsigned bit, void (*remove)(void*))
-{
-	unsigned keysize = sizeof(uint32_t)*8;
-	unsigned i;
-
-	if (!htbl)
-		return;
-
-	if (bit >= keysize) {
-		/* entry, delete it */
-		if (remove)
-			remove(htbl);
-		return;
-	}
-
-	for (i = 0; i < 1<<_STARPU_HTBL32_NODE_SIZE; i++) {
-		_starpu_htbl_destroy_32_bit(htbl->children[i], bit+_STARPU_HTBL32_NODE_SIZE, remove);
-	}
-
-	free(htbl);
-}
-void _starpu_htbl_destroy_32(struct starpu_htbl32_node *htbl, void (*remove)(void*))
-{
-	_starpu_htbl_destroy_32_bit(htbl, 0, remove);
-}

+ 0 - 47
src/common/htable32.h

@@ -1,47 +0,0 @@
-/* StarPU --- Runtime system for heterogeneous multicore architectures.
- *
- * Copyright (C) 2009-2010, 2012  Université de Bordeaux 1
- * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
- *
- * StarPU is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * StarPU is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * See the GNU Lesser General Public License in COPYING.LGPL for more details.
- */
-
-#ifndef __GENERIC_HTABLE_H__
-#define __GENERIC_HTABLE_H__
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
-
-#define _STARPU_HTBL32_NODE_SIZE	8
-
-/* Hierarchical table: all nodes have a 2^8 arity . */
-/* Note: this struct is used in include/starpu_perfmodel.h */
-struct starpu_htbl32_node {
-	unsigned nentries;
-	struct starpu_htbl32_node *children[1<<_STARPU_HTBL32_NODE_SIZE];
-};
-
-/* Look for a 32bit key into the hierchical table. Returns the entry if
- * something is found, NULL otherwise. */
-void *_starpu_htbl_search_32(struct starpu_htbl32_node *htbl, uint32_t key);
-
-/* Insert an entry indexed by the 32bit key into the hierarchical table.
- * Returns the entry that was previously associated to that key if any, NULL
- * otherwise. */
-void *_starpu_htbl_insert_32(struct starpu_htbl32_node **htbl, uint32_t key, void *entry);
-
-/* Delete the content of the table, `remove' being called on each element */
-void _starpu_htbl_destroy_32(struct starpu_htbl32_node *htbl, void (*remove)(void*));
-
-#endif // __GENERIC_HTABLE_H__

+ 0 - 106
src/common/htable64.c

@@ -1,106 +0,0 @@
-/* StarPU --- Runtime system for heterogeneous multicore architectures.
- *
- * Copyright (C) 2009-2010, 2012  Université de Bordeaux 1
- * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
- *
- * StarPU is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * StarPU is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * See the GNU Lesser General Public License in COPYING.LGPL for more details.
- */
-
-#include <starpu.h>
-#include <common/config.h>
-#include <common/htable64.h>
-#include <stdint.h>
-#include <string.h>
-
-void *_starpu_htbl_search_64(struct starpu_htbl64_node *htbl, uint64_t key)
-{
-	unsigned currentbit;
-	unsigned keysize = sizeof(uint64_t)*8;
-
-	struct starpu_htbl64_node *current_htbl = htbl;
-	uint64_t mask = (1ULL<<_STARPU_HTBL64_NODE_SIZE)-1;
-
-	for(currentbit = 0; currentbit < keysize; currentbit+=_STARPU_HTBL64_NODE_SIZE)
-	{
-		if (STARPU_UNLIKELY(current_htbl == NULL))
-			return NULL;
-
-		unsigned last_currentbit =
-			keysize - (currentbit + _STARPU_HTBL64_NODE_SIZE);
-		uint64_t offloaded_mask = mask << last_currentbit;
-		unsigned current_index =
-			(key & (offloaded_mask)) >> (last_currentbit);
-
-		current_htbl = current_htbl->children[current_index];
-	}
-	return current_htbl;
-}
-
-/*
- * returns the previous value of the tag, or NULL else
- */
-
-void *_starpu_htbl_insert_64(struct starpu_htbl64_node **htbl, uint64_t key, void *entry)
-{
-	unsigned currentbit;
-	unsigned keysize = sizeof(uint64_t)*8;
-	struct starpu_htbl64_node **current_htbl_ptr = htbl;
-
-	uint64_t mask = (1ULL<<_STARPU_HTBL64_NODE_SIZE)-1;
-	for(currentbit = 0; currentbit < keysize; currentbit+=_STARPU_HTBL64_NODE_SIZE)
-	{
-		if (*current_htbl_ptr == NULL)
-		{
-			*current_htbl_ptr = (struct starpu_htbl64_node*)calloc(sizeof(struct starpu_htbl64_node), 1);
-			STARPU_ASSERT(*current_htbl_ptr);
-		}
-
-		unsigned last_currentbit =
-			keysize - (currentbit + _STARPU_HTBL64_NODE_SIZE);
-		uint64_t offloaded_mask = mask << last_currentbit;
-		unsigned current_index =
-			(key & (offloaded_mask)) >> (last_currentbit);
-
-		current_htbl_ptr =
-			&((*current_htbl_ptr)->children[current_index]);
-	}
-	void *old_entry = *current_htbl_ptr;
-	*current_htbl_ptr = (struct starpu_htbl64_node *) entry;
-
-	return old_entry;
-}
-
-static void _starpu_htbl_destroy_64_bit(struct starpu_htbl64_node *htbl, unsigned bit, void (*remove)(void*))
-{
-	unsigned keysize = sizeof(uint64_t)*8;
-	unsigned i;
-
-	if (!htbl)
-		return;
-
-	if (bit >= keysize) {
-		/* entry, delete it */
-		if (remove)
-			remove(htbl);
-		return;
-	}
-
-	for (i = 0; i < 1ULL<<_STARPU_HTBL64_NODE_SIZE; i++) {
-		_starpu_htbl_destroy_64_bit(htbl->children[i], bit+_STARPU_HTBL64_NODE_SIZE, remove);
-	}
-
-	free(htbl);
-}
-void _starpu_htbl_destroy_64(struct starpu_htbl64_node *htbl, void (*remove)(void*))
-{
-	_starpu_htbl_destroy_64_bit(htbl, 0, remove);
-}

+ 0 - 46
src/common/htable64.h

@@ -1,46 +0,0 @@
-/* StarPU --- Runtime system for heterogeneous multicore architectures.
- *
- * Copyright (C) 2009-2010, 2012  Université de Bordeaux 1
- * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
- *
- * StarPU is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * StarPU is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * See the GNU Lesser General Public License in COPYING.LGPL for more details.
- */
-
-#ifndef __GENERIC_HTABLE_H__
-#define __GENERIC_HTABLE_H__
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
-
-#define _STARPU_HTBL64_NODE_SIZE	8 
-
-/* Hierarchical table: all nodes have a 2^8 arity . */
-struct starpu_htbl64_node {
-	unsigned nentries;
-	struct starpu_htbl64_node *children[1ULL<<_STARPU_HTBL64_NODE_SIZE];
-};
-
-/* Look for a 64bit key into the hierchical table. Returns the entry if
- * something is found, NULL otherwise. */
-void *_starpu_htbl_search_64(struct starpu_htbl64_node *htbl, uint64_t key);
-
-/* Insert an entry indexed by the 64bit key into the hierarchical table.
- * Returns the entry that was previously associated to that key if any, NULL
- * otherwise. */
-void *_starpu_htbl_insert_64(struct starpu_htbl64_node **htbl, uint64_t key, void *entry);
-
-/* Delete the content of the table, `remove' being called on each element */
-void _starpu_htbl_destroy_64(struct starpu_htbl64_node *htbl, void (*remove)(void*));
-
-#endif // __GENERIC_HTABLE_H__

+ 1 - 2
src/core/dependencies/dependencies.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2010, 2012  Université de Bordeaux 1
- * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2011, 2012  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -19,7 +19,6 @@
 #include <common/config.h>
 #include <common/utils.h>
 #include <core/dependencies/tags.h>
-#include <core/dependencies/htable.h>
 #include <core/jobs.h>
 #include <core/sched_policy.h>
 #include <core/dependencies/data_concurrency.h>

+ 0 - 197
src/core/dependencies/htable.c

@@ -1,197 +0,0 @@
-/* StarPU --- Runtime system for heterogeneous multicore architectures.
- *
- * Copyright (C) 2009-2012  Université de Bordeaux 1
- * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
- *
- * StarPU is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * StarPU is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * See the GNU Lesser General Public License in COPYING.LGPL for more details.
- */
-
-#include <core/dependencies/htable.h>
-#include <string.h>
-
-void *_starpu_htbl_search_tag(struct _starpu_htbl_node *htbl, starpu_tag_t tag)
-{
-	unsigned currentbit;
-	struct _starpu_htbl_node *current_htbl = htbl;
-
-	/* 000000000001111 with _STARPU_HTBL_NODE_SIZE 1's */
-	starpu_tag_t mask = (1<<_STARPU_HTBL_NODE_SIZE)-1;
-
-	for(currentbit = 0; currentbit < _STARPU_TAG_SIZE; currentbit+=_STARPU_HTBL_NODE_SIZE)
-	{
-	//	printf("search : current bit = %d \n", currentbit);
-		if (STARPU_UNLIKELY(current_htbl == NULL))
-			return NULL;
-
-		/* 0000000000001111
-		 *     | currentbit
-		 * 0000111100000000 = offloaded_mask
-		 *         |last_currentbit
-		 * */
-
-		unsigned last_currentbit =
-			_STARPU_TAG_SIZE - (currentbit + _STARPU_HTBL_NODE_SIZE);
-		starpu_tag_t offloaded_mask = mask << last_currentbit;
-		unsigned current_index =
-			(tag & (offloaded_mask)) >> (last_currentbit);
-
-		current_htbl = current_htbl->children[current_index];
-	}
-
-	return current_htbl;
-}
-
-/*
- * returns the previous value of the tag, or NULL else
- */
-
-void *_starpu_htbl_insert_tag(struct _starpu_htbl_node **htbl, starpu_tag_t tag, void *entry)
-{
-	unsigned currentbit;
-	struct _starpu_htbl_node **current_htbl_ptr = htbl;
-	struct _starpu_htbl_node *previous_htbl_ptr = NULL;
-
-	/* 000000000001111 with _STARPU_HTBL_NODE_SIZE 1's */
-	starpu_tag_t mask = (1<<_STARPU_HTBL_NODE_SIZE)-1;
-
-	for(currentbit = 0; currentbit < _STARPU_TAG_SIZE; currentbit+=_STARPU_HTBL_NODE_SIZE)
-	{
-		if (*current_htbl_ptr == NULL)
-		{
-			/* TODO pad to change that 1 into 16 ? */
-			*current_htbl_ptr = (struct _starpu_htbl_node *) calloc(1, sizeof(struct _starpu_htbl_node));
-			STARPU_ASSERT(*current_htbl_ptr);
-
-			if (previous_htbl_ptr)
-				previous_htbl_ptr->nentries++;
-		}
-
-		/* 0000000000001111
-		 *     | currentbit
-		 * 0000111100000000 = offloaded_mask
-		 *         |last_currentbit
-		 * */
-
-		unsigned last_currentbit =
-			_STARPU_TAG_SIZE - (currentbit + _STARPU_HTBL_NODE_SIZE);
-		starpu_tag_t offloaded_mask = mask << last_currentbit;
-		unsigned current_index =
-			(tag & (offloaded_mask)) >> (last_currentbit);
-
-		previous_htbl_ptr = *current_htbl_ptr;
-		current_htbl_ptr =
-			&((*current_htbl_ptr)->children[current_index]);
-	}
-
-	/* current_htbl either contains NULL or a previous entry
-	 * we overwrite it anyway */
-	void *old_entry = *current_htbl_ptr;
-	*current_htbl_ptr = (struct _starpu_htbl_node *) entry;
-
-	if (!old_entry)
-		previous_htbl_ptr->nentries++;
-
-	return old_entry;
-}
-
-/* returns the entry corresponding to the tag and remove it from the htbl */
-void *_starpu_htbl_remove_tag(struct _starpu_htbl_node **htbl, starpu_tag_t tag)
-{
-	/* NB : if the entry is "NULL", we assume this means it is not present XXX */
-	unsigned currentbit;
-	struct _starpu_htbl_node **current_htbl_ptr_parent = htbl;
-	struct _starpu_htbl_node *current_htbl_ptr = *current_htbl_ptr_parent;
-
-	/* remember the path to the tag */
-	struct _starpu_htbl_node *path[(_STARPU_TAG_SIZE + _STARPU_HTBL_NODE_SIZE - 1)/(_STARPU_HTBL_NODE_SIZE)];
-	struct _starpu_htbl_node **path_parent[(_STARPU_TAG_SIZE + _STARPU_HTBL_NODE_SIZE - 1)/(_STARPU_HTBL_NODE_SIZE)];
-
-	/* 000000000001111 with _STARPU_HTBL_NODE_SIZE 1's */
-	starpu_tag_t mask = (1<<_STARPU_HTBL_NODE_SIZE)-1;
-	int level, maxlevel;
-	unsigned tag_is_present = 1;
-
-	for(currentbit = 0, level = 0; currentbit < _STARPU_TAG_SIZE; currentbit+=_STARPU_HTBL_NODE_SIZE, level++)
-	{
-		path_parent[level] = current_htbl_ptr_parent;
-		path[level] = current_htbl_ptr;
-
-		if (STARPU_UNLIKELY(!current_htbl_ptr))
-		{
-			tag_is_present = 0;
-			break;
-		}
-
-		/* 0000000000001111
-		 *     | currentbit
-		 * 0000111100000000 = offloaded_mask
-		 *         |last_currentbit
-		 * */
-
-		unsigned last_currentbit =
-			_STARPU_TAG_SIZE - (currentbit + _STARPU_HTBL_NODE_SIZE);
-		starpu_tag_t offloaded_mask = mask << last_currentbit;
-		unsigned current_index =
-			(tag & (offloaded_mask)) >> (last_currentbit);
-
-		current_htbl_ptr_parent = 
-			&current_htbl_ptr->children[current_index];
-		current_htbl_ptr = *current_htbl_ptr_parent;
-	}
-
-	maxlevel = level;
-	if (STARPU_UNLIKELY(!current_htbl_ptr))
-		tag_is_present = 0;
-
-	void *old_entry = current_htbl_ptr;
-
-	if (tag_is_present)
-	{
-		/* the tag was in the htbl, so we have to unroll the search
- 		 * to remove possibly useless htbl (internal) nodes */
-		for (level = maxlevel - 1; level >= 0; level--)
-		{
-			path[level]->nentries--;
-
-			/* TODO use likely statements ... */
-
-			/* in case we do not remove that node, we do decrease its parents
- 			 * number of entries */
-			if (path[level]->nentries > 0)
-				break;
-
-			/* we remove this node */
-			free(path[level]);
-			*(path_parent[level]) = NULL;
-		}
-	}
-
-	/* we return the entry if there was one */
-	return old_entry;
-}
-
-void _starpu_htbl_clear_tags(struct _starpu_htbl_node **htbl, unsigned level, void (*free_entry)(void *))
-{
-	unsigned i;
-	struct _starpu_htbl_node *tbl = *htbl;
-
-	if (!tbl)
-		return;
-
-	if (level * _STARPU_HTBL_NODE_SIZE < _STARPU_TAG_SIZE) {
-		for (i = 0; i < 1<<_STARPU_HTBL_NODE_SIZE; i++)
-			_starpu_htbl_clear_tags(&tbl->children[i], level + 1, free_entry);
-		free(tbl);
-	} else
-		free_entry(tbl);
-	*htbl = NULL;
-}

+ 0 - 45
src/core/dependencies/htable.h

@@ -1,45 +0,0 @@
-/* StarPU --- Runtime system for heterogeneous multicore architectures.
- *
- * Copyright (C) 2009-2012  Université de Bordeaux 1
- * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
- *
- * StarPU is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * StarPU is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * See the GNU Lesser General Public License in COPYING.LGPL for more details.
- */
-
-#ifndef __HTABLE_H__
-#define __HTABLE_H__
-
-/*
- *	Define a hierarchical table to do the tag matching
- */
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
-#include <core/dependencies/tags.h>
-
-#define _STARPU_HTBL_NODE_SIZE	8
-
-struct _starpu_htbl_node
-{
-	unsigned nentries;
-	struct _starpu_htbl_node *children[1<<_STARPU_HTBL_NODE_SIZE];
-};
-
-void *_starpu_htbl_search_tag(struct _starpu_htbl_node *htbl, starpu_tag_t tag);
-void *_starpu_htbl_insert_tag(struct _starpu_htbl_node **htbl, starpu_tag_t tag, void *entry);
-void *_starpu_htbl_remove_tag(struct _starpu_htbl_node **htbl, starpu_tag_t tag);
-void _starpu_htbl_clear_tags(struct _starpu_htbl_node **htbl, unsigned level, void (*free_entry)(void*));
-
-
-#endif

+ 0 - 1
src/core/dependencies/task_deps.c

@@ -19,7 +19,6 @@
 #include <common/config.h>
 #include <common/utils.h>
 #include <core/dependencies/tags.h>
-#include <core/dependencies/htable.h>
 #include <core/jobs.h>
 #include <core/task.h>
 #include <core/sched_policy.h>

+ 0 - 1
src/core/perfmodel/perfmodel.h

@@ -22,7 +22,6 @@
 #include <common/config.h>
 #include <starpu.h>
 #include <starpu_perfmodel.h>
-#include <common/htable32.h>
 #include <core/task_bundle.h>
 #include <pthread.h>
 #include <stdio.h>