MonetDB: default - tomograph: indent to aboid future merge confl...

[Fabian Groffen]

Changeset: e85f39f968bd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e85f39f968bd
Modified Files:
        clients/mapiclient/tomograph.c
Branch: default
Log Message:

tomograph: indent to aboid future merge conflicts with Feb2013


diffs (112 lines):

diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c
--- a/clients/mapiclient/tomograph.c
+++ b/clients/mapiclient/tomograph.c
@@ -197,6 +197,7 @@ static void deactivateBeat(void)
                        doQ("profiler.stop();");
                }
 
+
        return;
 stop_disconnect:
        ;
@@ -253,6 +254,7 @@ static void activateBeat(void)
                        doQ(buf);
                }
 
+
        return;
 stop_disconnect:
        if (wthr) {
@@ -618,6 +620,7 @@ static void dumpboxes(void)
                        }
                }
 
+
        if (f)
                (void) fclose(f);
        if (fcpu)
@@ -644,6 +647,7 @@ static void showmemory(void)
                }
 
 
+
        fprintf(gnudata, "\nset tmarg 1\n");
        fprintf(gnudata, "set bmarg 1\n");
        fprintf(gnudata, "set lmarg 10\n");
@@ -703,6 +707,7 @@ static void showio(void)
                }
 
 
+
        fprintf(gnudata, "\nset tmarg 1\n");
        fprintf(gnudata, "set bmarg 1\n");
        fprintf(gnudata, "set lmarg 10\n");
@@ -792,6 +797,7 @@ static void showcolormap(char *filename,
                        k++;
                }
 
+
        h -= 45;
        fprintf(f, "set label %d \" %ld MAL instructions executed\" at %d,%d\n",
                        object++, totfreq, (int) (0.2 * w), h - 35);
@@ -808,16 +814,18 @@ static void updmap(int idx)
        if (fcn) {
                *fcn = 0;
                fcn++;
-       } else fcn = "*";
-       for ( i =0; colors[i].col; i++)
-       if ( mod && strcmp(mod,colors[i].mod)== 0) {
-               if (strcmp(fcn,colors[i].fcn) == 0 ){
-                       fnd = i;
-                       break;
+       } else
+               fcn = "*";
+       for (i = 0; colors[i].col; i++)
+               if (mod && strcmp(mod, colors[i].mod) == 0) {
+                       if (strcmp(fcn, colors[i].fcn) == 0) {
+                               fnd = i;
+                               break;
+                       }
                }
-       } 
-       if ( colors[i].col == 0 )
-               fnd = i-1;
+
+       if (colors[i].col == 0)
+               fnd = i - 1;
        colors[fnd].freq++;
        colors[fnd].timeused += box[idx].clkend - box[idx].clkstart;
        box[idx].color = fnd;
@@ -848,6 +856,7 @@ static void keepdata(char *filename)
                        fprintf(f, "%s\n", box[i].fcn);
                }
 
+
        (void) fclose(f);
 }
 
@@ -973,6 +982,7 @@ static void createTomogram(void)
                }
 
 
+
        height = top * 20;
        fprintf(gnudata, "set yrange [0:%d]\n", height);
        fprintf(gnudata, "set ylabel \"threads\"\n");
@@ -1027,6 +1037,7 @@ static void createTomogram(void)
                                        object++, box[i].clkstart, box[i].row * 
2 * h, box[i].clkend, box[i].row * 2 * h + h, colors[box[i].color].col);
                }
 
+
        fprintf(gnudata, "plot 0 notitle with lines\n");
        fprintf(gnudata, "unset for[i=%d:%d] object i\n", prevobject, object - 
1);
        prevobject = object - 1;
@@ -1635,7 +1646,7 @@ main(int argc, char **argv)
        }
 
        if (dbname == NULL && optind != argc && argv[optind][0] != '+' &&
-                       (stat(argv[optind], &statb) != 0 || 
!S_ISREG(statb.st_mode)))
+               (stat(argv[optind], &statb) != 0 || !S_ISREG(statb.st_mode)))
        {
                dbname = argv[optind];
                optind++;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list