[Linux-hls-cvs] hls/hls hls_names.c,NONE,1.1 hls_utils.c,1.15,1.16

[<lu...@us...>]

Update of /cvsroot/linux-hls/hls/hls
In directory sc8-pr-cvs1:/tmp/cvs-serv14351/hls

Modified Files:
	hls_utils.c 
Added Files:
	hls_names.c 
Log Message:
- Some cleanup & code reorganization
- Fix the simulator's compilation
- Better logging macros for the simulator backend


--- NEW FILE: hls_names.c ---
/*
 * Copyright (c) 2003  Luca Abeni
 *
 * Module Name: hls_names.c
 * Abstract: HLS utility functions needed by the procfs stuff.
 * Author: Luca Abeni 20-Nov-2003
 *
 * This is free software; see BSD.txt
 */

#include "hls_common.h"
#include "hls_internal.h"
#include "thr.h"

extern struct HLS_CALLBACKS *HLSAbsScheds[HLS_MAX_ABS_SCHEDS];


char *hls_default_name(void)
{
  if (HLSDefaultSched == NULL) {
    return "";
  }

  HLSDbgPrint(5, ("Default %p: %s\n", HLSDefaultSched, HLSDefaultSched->Name));
  return HLSDefaultSched->Name;
}
void hls_setdefault(void *p)
{
  int wasnull;

  wasnull = 0;
  if (HLSDefaultSched == NULL) {
    wasnull =1;
  }
  HLSDefaultSched = p;
  if (wasnull) {
    hls_convert_tasks();
  }
}
char *hls_rt_name(void)
{
  if (hls_rt_sched == NULL) {
    return "";
  }

  HLSDbgPrint(5, ("RT Scheduler %p: %s\n",
			  hls_rt_sched, hls_rt_sched->Name));
  
  return hls_rt_sched->Name;
}
void hls_setrt(void *p)
{
  hls_rt_sched = p;
}

char *hls_instance_name(int i)
{
  if (i >= HLS_MAX_SCHED_INSTS) {
    return (char *)-1;
  }

  if (!HLSAllSchedInsts[i]) {
    return NULL;
  }
  return HLSAllSchedInsts[i]->Name;
}
char *hls_instance_scheduler(int i)
{
  if (i >= HLS_MAX_SCHED_INSTS) {
    return (char *)-1;
  }

  if (!HLSAllSchedInsts[i]) {
    return NULL;
  }
  return HLSAllSchedInsts[i]->Type;
}
char *hls_instance_father(int i)
{
  if (i >= HLS_MAX_SCHED_INSTS) {
    return (char *)-1;
  }

  if (!HLSAllSchedInsts[i]) {
    return NULL;
  }
  if (HLSAllSchedInsts[i]->Parent) {
    return HLSAllSchedInsts[i]->Parent->Name;
  }

  return "";
}
char *hls_scheduler_name(int i)
{
  if (i >= HLS_MAX_ABS_SCHEDS) {
    return (char *)-1;
  }

  if (!HLSAbsScheds[i]) {
    return NULL;
  }
  return HLSAbsScheds[i]->Name;
}

Index: hls_utils.c
===================================================================
RCS file: /cvsroot/linux-hls/hls/hls/hls_utils.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** hls_utils.c	8 Nov 2003 10:34:31 -0000	1.15
--- hls_utils.c	29 Nov 2003 09:11:34 -0000	1.16
***************
*** 199,289 ****
  }
  
- char *hls_default_name(void)
- {
-   if (HLSDefaultSched == NULL) {
-     return "";
-   }
- 
-   HLSDbgPrint(5, ("Default %p: %s\n", HLSDefaultSched, HLSDefaultSched->Name));
-   return HLSDefaultSched->Name;
- }
- void hls_setdefault(void *p)
- {
-   int wasnull;
- 
-   wasnull = 0;
-   if (HLSDefaultSched == NULL) {
-     wasnull =1;
-   }
-   HLSDefaultSched = p;
-   if (wasnull) {
-     hls_convert_tasks();
-   }
- }
- char *hls_rt_name(void)
- {
-   if (hls_rt_sched == NULL) {
-     return "";
-   }
- 
-   HLSDbgPrint(5, ("RT Scheduler %p: %s\n",
- 			  hls_rt_sched, hls_rt_sched->Name));
-   
-   return hls_rt_sched->Name;
- }
- void hls_setrt(void *p)
- {
-   hls_rt_sched = p;
- }
- 
- char *hls_instance_name(int i)
- {
-   if (i >= HLS_MAX_SCHED_INSTS) {
-     return (char *)-1;
-   }
- 
-   if (!HLSAllSchedInsts[i]) {
-     return NULL;
-   }
-   return HLSAllSchedInsts[i]->Name;
- }
- char *hls_instance_scheduler(int i)
- {
-   if (i >= HLS_MAX_SCHED_INSTS) {
-     return (char *)-1;
-   }
- 
-   if (!HLSAllSchedInsts[i]) {
-     return NULL;
-   }
-   return HLSAllSchedInsts[i]->Type;
- }
- char *hls_instance_father(int i)
- {
-   if (i >= HLS_MAX_SCHED_INSTS) {
-     return (char *)-1;
-   }
- 
-   if (!HLSAllSchedInsts[i]) {
-     return NULL;
-   }
-   if (HLSAllSchedInsts[i]->Parent) {
-     return HLSAllSchedInsts[i]->Parent->Name;
-   }
- 
-   return "";
- }
- char *hls_scheduler_name(int i)
- {
-   if (i >= HLS_MAX_ABS_SCHEDS) {
-     return (char *)-1;
-   }
- 
-   if (!HLSAbsScheds[i]) {
-     return NULL;
-   }
-   return HLSAbsScheds[i]->Name;
- }
- 
  HLS_STATUS HLSUnregisterScheduler (struct HLS_CALLBACKS *NewSchedCB)
  {
--- 199,202 ----
***************
*** 430,434 ****
  }
  
! extern int hls_setparam_ascii(struct HLS_SCHED_INSTANCE *inst, char *param);
  static void CreateSimpleHierarchy (void)
  {
--- 343,347 ----
  }
  
! //extern int hls_setparam_ascii(struct HLS_SCHED_INSTANCE *inst, char *param);
  static void CreateSimpleHierarchy (void)
  {