X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8a80a7488d5a9c1b57d287f939a310ee63c27583..272ccad1b68b6d9c17069f3c934886925bb15b5d:/examples/smpi/NAS/DT-trace/DGraph.c

diff --git a/examples/smpi/NAS/DT-trace/DGraph.c b/examples/smpi/NAS/DT-trace/DGraph.c
index 5d5839df19..f573786db8 100644
--- a/examples/smpi/NAS/DT-trace/DGraph.c
+++ b/examples/smpi/NAS/DT-trace/DGraph.c
@@ -32,7 +32,7 @@ DGNode *newNode(char *nm){
 }
 void nodeShow(DGNode* nd){
   fprintf( stderr,"%3d.%s: (%d,%d)\n",
-	           nd->id,nd->name,nd->inDegree,nd->outDegree);
+             nd->id,nd->name,nd->inDegree,nd->outDegree);
 /*
   if(nd->verified==1) fprintf(stderr,"%ld.%s\t: usable.",nd->id,nd->name);
   else if(nd->verified==0)  fprintf(stderr,"%ld.%s\t: unusable.",nd->id,nd->name);
@@ -56,103 +56,103 @@ int AttachNode(DGraph* dg, DGNode* nd) {
   DGNode **nds =NULL, *tmpnd=NULL;
   DGArc **ar=NULL;
 
-	if (dg->numNodes == dg->maxNodes-1 ) {
-	  dg->maxNodes += BLOCK_SIZE;
+  if (dg->numNodes == dg->maxNodes-1 ) {
+    dg->maxNodes += BLOCK_SIZE;
           nds =(DGNode **) calloc(dg->maxNodes,sizeof(DGNode*));
-	  memcpy(nds,dg->node,(dg->maxNodes-BLOCK_SIZE)*sizeof(DGNode*));
-	  free(dg->node);
-	  dg->node=nds;
-	}
+    memcpy(nds,dg->node,(dg->maxNodes-BLOCK_SIZE)*sizeof(DGNode*));
+    free(dg->node);
+    dg->node=nds;
+  }
 
         len = strlen( nd->name);
-	for (i = 0; i < dg->numNodes; i++) {
-	  tmpnd =dg->node[ i];
-	  ar=NULL;
-	  if ( strlen( tmpnd->name) != len ) continue;
-	  if ( strncmp( nd->name, tmpnd->name, len) ) continue;
-	  if ( nd->inDegree > 0 ) {
-	    tmpnd->maxInDegree += nd->maxInDegree;
+  for (i = 0; i < dg->numNodes; i++) {
+    tmpnd =dg->node[ i];
+    ar=NULL;
+    if ( strlen( tmpnd->name) != len ) continue;
+    if ( strncmp( nd->name, tmpnd->name, len) ) continue;
+    if ( nd->inDegree > 0 ) {
+      tmpnd->maxInDegree += nd->maxInDegree;
             ar =(DGArc **) calloc(tmpnd->maxInDegree,sizeof(DGArc*));
-	    memcpy(ar,tmpnd->inArc,(tmpnd->inDegree)*sizeof(DGArc*));
-	    free(tmpnd->inArc);
-	    tmpnd->inArc=ar;
-	    for (j = 0; j < nd->inDegree; j++ ) {
-	      nd->inArc[ j]->head = tmpnd;
-	    }
-	    memcpy( &(tmpnd->inArc[ tmpnd->inDegree]), nd->inArc, nd->inDegree*sizeof( DGArc *));
-	    tmpnd->inDegree += nd->inDegree;
-	  } 	
-	  if ( nd->outDegree > 0 ) {
-	    tmpnd->maxOutDegree += nd->maxOutDegree;
+      memcpy(ar,tmpnd->inArc,(tmpnd->inDegree)*sizeof(DGArc*));
+      free(tmpnd->inArc);
+      tmpnd->inArc=ar;
+      for (j = 0; j < nd->inDegree; j++ ) {
+        nd->inArc[ j]->head = tmpnd;
+      }
+      memcpy( &(tmpnd->inArc[ tmpnd->inDegree]), nd->inArc, nd->inDegree*sizeof( DGArc *));
+      tmpnd->inDegree += nd->inDegree;
+    }   
+    if ( nd->outDegree > 0 ) {
+      tmpnd->maxOutDegree += nd->maxOutDegree;
             ar =(DGArc **) calloc(tmpnd->maxOutDegree,sizeof(DGArc*));
-	    memcpy(ar,tmpnd->outArc,(tmpnd->outDegree)*sizeof(DGArc*));
-	    free(tmpnd->outArc);
-	    tmpnd->outArc=ar;
-	    for (j = 0; j < nd->outDegree; j++ ) {
-	      nd->outArc[ j]->tail = tmpnd;
-	    }			
-	    memcpy( &(tmpnd->outArc[tmpnd->outDegree]),nd->outArc,nd->outDegree*sizeof( DGArc *));
-	    tmpnd->outDegree += nd->outDegree;
-	  } 
-	  free(nd); 
-	  return i;
-	}
-	nd->id = dg->numNodes;
-	dg->node[dg->numNodes] = nd;
-	dg->numNodes++;
+      memcpy(ar,tmpnd->outArc,(tmpnd->outDegree)*sizeof(DGArc*));
+      free(tmpnd->outArc);
+      tmpnd->outArc=ar;
+      for (j = 0; j < nd->outDegree; j++ ) {
+        nd->outArc[ j]->tail = tmpnd;
+      }      
+      memcpy( &(tmpnd->outArc[tmpnd->outDegree]),nd->outArc,nd->outDegree*sizeof( DGArc *));
+      tmpnd->outDegree += nd->outDegree;
+    } 
+    free(nd); 
+    return i;
+  }
+  nd->id = dg->numNodes;
+  dg->node[dg->numNodes] = nd;
+  dg->numNodes++;
 return nd->id;
 }
 int AttachArc(DGraph *dg,DGArc* nar){
-int	arcId = -1;
+int  arcId = -1;
 int i=0,newNumber=0;
-DGNode	*head = nar->head,
-	*tail = nar->tail; 
+DGNode  *head = nar->head,
+  *tail = nar->tail; 
 DGArc **ars=NULL,*probe=NULL;
 /*fprintf(stderr,"AttachArc %ld\n",dg->numArcs); */
-	if ( !tail || !head ) return arcId;
-	if ( dg->numArcs == dg->maxArcs-1 ) {
-	  dg->maxArcs += BLOCK_SIZE;
+  if ( !tail || !head ) return arcId;
+  if ( dg->numArcs == dg->maxArcs-1 ) {
+    dg->maxArcs += BLOCK_SIZE;
           ars =(DGArc **) calloc(dg->maxArcs,sizeof(DGArc*));
-	  memcpy(ars,dg->arc,(dg->maxArcs-BLOCK_SIZE)*sizeof(DGArc*));
-	  free(dg->arc);
-	  dg->arc=ars;
-	}
-	for(i = 0; i < tail->outDegree; i++ ) { /* parallel arc */
-	  probe = tail->outArc[ i];
-	  if(probe->head == head
-	     &&
-	     probe->length == nar->length
+    memcpy(ars,dg->arc,(dg->maxArcs-BLOCK_SIZE)*sizeof(DGArc*));
+    free(dg->arc);
+    dg->arc=ars;
+  }
+  for(i = 0; i < tail->outDegree; i++ ) { /* parallel arc */
+    probe = tail->outArc[ i];
+    if(probe->head == head
+       &&
+       probe->length == nar->length
             ){
             free(nar);
-	    return probe->id;   
-	  }
-	}
-	
-	nar->id = dg->numArcs;
-	arcId=dg->numArcs;
-	dg->arc[dg->numArcs] = nar;
-	dg->numArcs++;
-	
-	head->inArc[ head->inDegree] = nar;
-	head->inDegree++;
-	if ( head->inDegree >= head->maxInDegree ) {
-	  newNumber = head->maxInDegree + SMALL_BLOCK_SIZE;
+      return probe->id;   
+    }
+  }
+  
+  nar->id = dg->numArcs;
+  arcId=dg->numArcs;
+  dg->arc[dg->numArcs] = nar;
+  dg->numArcs++;
+  
+  head->inArc[ head->inDegree] = nar;
+  head->inDegree++;
+  if ( head->inDegree >= head->maxInDegree ) {
+    newNumber = head->maxInDegree + SMALL_BLOCK_SIZE;
           ars =(DGArc **) calloc(newNumber,sizeof(DGArc*));
-	  memcpy(ars,head->inArc,(head->inDegree)*sizeof(DGArc*));
-	  free(head->inArc);
-	  head->inArc=ars;
-	  head->maxInDegree = newNumber;
-	}
-	tail->outArc[ tail->outDegree] = nar;
-	tail->outDegree++;
-	if(tail->outDegree >= tail->maxOutDegree ) {
-	  newNumber = tail->maxOutDegree + SMALL_BLOCK_SIZE;
+    memcpy(ars,head->inArc,(head->inDegree)*sizeof(DGArc*));
+    free(head->inArc);
+    head->inArc=ars;
+    head->maxInDegree = newNumber;
+  }
+  tail->outArc[ tail->outDegree] = nar;
+  tail->outDegree++;
+  if(tail->outDegree >= tail->maxOutDegree ) {
+    newNumber = tail->maxOutDegree + SMALL_BLOCK_SIZE;
           ars =(DGArc **) calloc(newNumber,sizeof(DGArc*));
-	  memcpy(ars,tail->outArc,(tail->outDegree)*sizeof(DGArc*));
-	  free(tail->outArc);
-	  tail->outArc=ars;
-	  tail->maxOutDegree = newNumber;
-	}
+    memcpy(ars,tail->outArc,(tail->outDegree)*sizeof(DGArc*));
+    free(tail->outArc);
+    tail->outArc=ars;
+    tail->maxOutDegree = newNumber;
+  }
 /*fprintf(stderr,"AttachArc: head->in=%d tail->out=%ld\n",head->inDegree,tail->outDegree);*/
 return arcId;
 }
@@ -164,8 +164,8 @@ void graphShow(DGraph *dg,int DetailsLevel){
     DGNode *focusNode = dg->node[ i];
     if(DetailsLevel >= 2) {
       for (j = 0; j < focusNode->inDegree; j++ ) {
-	fprintf(stderr,"\t ");
-	nodeShow(focusNode->inArc[ j]->tail);
+  fprintf(stderr,"\t ");
+  nodeShow(focusNode->inArc[ j]->tail);
       }
     }
     nodeShow(focusNode);
@@ -173,7 +173,7 @@ void graphShow(DGraph *dg,int DetailsLevel){
     for (j = 0; j < focusNode->outDegree; j++ ) {
       fprintf(stderr, "\t ");
       nodeShow(focusNode->outArc[ j]->head);
-    }	
+    }  
     fprintf(stderr, "---\n");
   }
   fprintf(stderr,"----------------------------------------\n");