[Linux-hls-cvs] qosman/demos txtdemo.c,1.1,1.2

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

Update of /cvsroot/linux-hls/qosman/demos
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32358

Modified Files:
	txtdemo.c 
Log Message:
Improve the text demo... Now, it can run more than 1 task :)


Index: txtdemo.c
===================================================================
RCS file: /cvsroot/linux-hls/qosman/demos/txtdemo.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** txtdemo.c	9 Apr 2004 13:41:31 -0000	1.1
--- txtdemo.c	24 Aug 2005 10:59:21 -0000	1.2
***************
*** 19,22 ****
--- 19,23 ----
  DWORD times[10000];
  int global;
+ static WINDOW *scr;
  
  static void exit_handler(int dummy)
***************
*** 31,35 ****
  void tb(WORD i)
  {
-   WINDOW *scr;
    struct sigaction sa;
    int res;
--- 32,35 ----
***************
*** 38,42 ****
    
    /* TODO: Init */
-   scr = initscr();
    sa.sa_handler = exit_handler;
    sigemptyset(&sa.sa_mask);
--- 38,41 ----
***************
*** 110,113 ****
--- 109,113 ----
      char name[80];
      int dummy;
+     int i, start, end;
  
      cprintf("Goin' to initialize the QoS Library...");
***************
*** 123,147 ****
      qman_feedback(&pidactions);
      
!     t.wcet = Q0;
!     t.per = T;
!     t.reduce = T / TS;
!     t.w = W;
      if (argc > 1) {
!       t.arg = atoi(argv[1]);
      } else {
!       t.arg = 0;
      }
!     sprintf(name, "QDemo Task %d", t.arg);
!     t.name = name;
!     t.body = tb;
!     t.model = MM_TASK;
  
!     qt = qman_task(&t);
!     if (qt == 0) {
! 	printf("QoS Task creation failed...\n");
! 	exit(-1);
      }
-     
-     wait(&dummy);
  
      printf("Waited...\n");
--- 123,159 ----
      qman_feedback(&pidactions);
      
!     scr = initscr();
!     
      if (argc > 1) {
!         start = atoi(argv[1]);
      } else {
!         start = 0;
      }
!     if (argc > 2) {
!         end = atoi(argv[2]);
!     } else {
!         end = start + 1;
!     }
!     for (i = start; i < end; i++) {
!         t.wcet = Q0;
!         t.per = T;
!         t.reduce = T / TS;
!         t.w = W;
!         t.arg = i;
!         sprintf(name, "QDemo Task %d", t.arg);
!         t.name = name;
!         t.body = tb;
!         t.model = MM_TASK;
  
!         qt = qman_task(&t);
!         if (qt == 0) {
! 	    printf("QoS Task creation failed...\n");
! 	
! 	    exit(-1);
! 	}
!     }
!     for (i = start; i < end; i++) {
!         wait(&dummy);
      }
  
      printf("Waited...\n");