Browse Source

src/core/perfmodel: get rid off now-useless function _starpu_register_model()

Nathalie Furmento 10 years ago
parent
commit
62cca2a7aa

+ 3 - 2
src/core/perfmodel/perfmodel.c

@@ -138,8 +138,9 @@ void _starpu_load_perfmodel(struct starpu_perfmodel *model)
 	if (!model || model->is_loaded)
 		return;
 
-	int load_model = _starpu_register_model(model);
-	if (!load_model)
+	starpu_perfmodel_init(NULL, model);
+
+	if (model->is_loaded)
 		return;
 
 	switch (model->type)

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

@@ -69,7 +69,6 @@ void _starpu_get_perf_model_dir_bus(char *path, size_t maxlen);
 void _starpu_get_perf_model_dir_debug(char *path, size_t maxlen);
 
 double _starpu_history_based_job_expected_perf(struct starpu_perfmodel *model, struct starpu_perfmodel_arch* arch, struct _starpu_job *j, unsigned nimpl);
-int _starpu_register_model(struct starpu_perfmodel *model);
 void _starpu_load_per_arch_based_model(struct starpu_perfmodel *model);
 void _starpu_load_common_based_model(struct starpu_perfmodel *model);
 void _starpu_load_history_based_model(struct starpu_perfmodel *model, unsigned scan_history);

+ 0 - 29
src/core/perfmodel/perfmodel_history.c

@@ -675,35 +675,6 @@ static void get_model_debug_path(struct starpu_perfmodel *model, const char *arc
 	strncat(path, ".debug", maxlen);
 }
 
-/*
- * Returns 0 if the model was already loaded, 1 otherwise.
- */
-int _starpu_register_model(struct starpu_perfmodel *model)
-{
-	starpu_perfmodel_init(NULL, model);
-
-	/* If the model has already been loaded, there is nothing to do */
-	STARPU_PTHREAD_RWLOCK_RDLOCK(&registered_models_rwlock);
-	if (model->is_loaded)
-	{
-		STARPU_PTHREAD_RWLOCK_UNLOCK(&registered_models_rwlock);
-		return 0;
-	}
-	STARPU_PTHREAD_RWLOCK_UNLOCK(&registered_models_rwlock);
-
-	/* We have to make sure the model has not been loaded since the
-         * last time we took the lock */
-	STARPU_PTHREAD_RWLOCK_WRLOCK(&registered_models_rwlock);
-	if (model->is_loaded)
-	{
-		STARPU_PTHREAD_RWLOCK_UNLOCK(&registered_models_rwlock);
-		return 0;
-	}
-
-	STARPU_PTHREAD_RWLOCK_UNLOCK(&registered_models_rwlock);
-	return 1;
-}
-
 static void get_model_path(struct starpu_perfmodel *model, char *path, size_t maxlen)
 {
 	_starpu_get_perf_model_dir_codelets(path, maxlen);