Changeset 13658

Timestamp:

Jun 5, 2007, 3:08:13 PM (19 years ago)

Author:

Paul Price

Message:

Adding maskVal parameter to ppStats so that when it's called as a library function, it uses the nominated maskVal rather than it's own (which may be completely different from what the parent program may think it should mask).

Location:

trunk/ppStats/src

Files:

• ppStats.c (modified) (2 diffs)
• ppStats.h (modified) (1 diff)
• ppStatsSetupFromArgs.c (modified) (1 diff)
• ppStatsSetupFromRecipe.c (modified) (2 diffs)
• ppStatsSetupFromRecipe.h (modified) (1 diff)
• ppStatsStandAlone.c (modified) (1 diff)

trunk/ppStats/src/ppStats.c

@@ -12 +12 @@
                     pmFPA *fpa,         // FPA for which to get statistics
                     pmFPAview *view,    // View for analysis
+                    psMaskType maskVal, // Value to mask
                     pmConfig *config    // Configuration
     )
 {
-    psExit status;
+    PS_ASSERT_PTR_NON_NULL(fpa, NULL)
+    PS_ASSERT_PTR_NON_NULL(view, NULL);
+    PS_ASSERT_PTR_NON_NULL(config, NULL);
+
+    ppStatsData *data = ppStatsDataAlloc(); // All the input data
 
     // Get the options, open the files
-    ppStatsData *data = ppStatsSetupFromRecipe(NULL, config);
+    if (!ppStatsSetupFromRecipe(data, config)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to get ppStats options from recipe.");
+        psFree(data);
+        return NULL;
+    }
+
+    // Override recipe mask value if one is provided
+    if (maskVal != 0) {
+        data->maskVal = maskVal;
+    }
 
     if (data->fpa) {
@@ -31 +45 @@
 
     // Go through the FPA and do the hard work
+    psExit status;                      // Status of statistics loop
     psMetadata *result = ppStatsLoop(&status, out, data, config);
     if (status != PS_EXIT_SUCCESS) {
-        psError (PS_ERR_UNKNOWN, false, "trouble getting stats\n");
+        psError (PS_ERR_UNKNOWN, false, "Not able to measure FPA statistics.\n");
         psFree(result);
-        psFree(data);
-        return (NULL);
+        psFree(data);
+        return (NULL);
     }
 

trunk/ppStats/src/ppStats.h

@@ -15 +15 @@
                     pmFPA *fpa,         // FPA for which to get statistics
                     pmFPAview *view,    // View for analysis
+                    psMaskType maskVal, // Value to mask
                     pmConfig *config    // Configuration
     );

trunk/ppStats/src/ppStatsSetupFromArgs.c

@@ -191 +191 @@
 
     // Get the rest from the recipe
-    ppStatsSetupFromRecipe(data, config);
+    if (!ppStatsSetupFromRecipe(data, config)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to read ppStats options from recipe.");
+        psFree(data);
+        return NULL;
+    }
 
     // Print out what we're going to do

trunk/ppStats/src/ppStatsSetupFromRecipe.c

@@ -14 +14 @@
 // Strings in a recipe may be defined multiply (with MULTI) or listed on a single line
 static void listFromRecipe(psList *target, // The target list
-                           const psMetadata *recipe, // Recipe to search
+                           const psMetadata *recipe, // Recipe to search
                            const char *name // Name for item within recipe
     )
@@ -65 +65 @@
 
 
-ppStatsData *ppStatsSetupFromRecipe(ppStatsData *data, // Data for running ppStats
-                                    pmConfig *config // Configuration
+bool ppStatsSetupFromRecipe(ppStatsData *data, // Data for running ppStats
+                            pmConfig *config // Configuration
     )
 {
-    if (!data) {
-        data = ppStatsDataAlloc();
-    }
+    PS_ASSERT_PTR_NON_NULL(data, false);
+    PS_ASSERT_PTR_NON_NULL(config, false);
 
     // Determine recipe parameters

trunk/ppStats/src/ppStatsSetupFromRecipe.h

@@ -5 +5 @@
 #include "ppStatsData.h"
 
-ppStatsData *ppStatsSetupFromRecipe(ppStatsData *data, // Data for running ppStats
-                                    pmConfig *config // Configuration
+bool ppStatsSetupFromRecipe(ppStatsData *data, // Data for running ppStats
+                            pmConfig *config // Configuration
     );
 

trunk/ppStats/src/ppStatsStandAlone.c

@@ -61 +61 @@
     if (status != PS_EXIT_SUCCESS) {
         psErrorStackPrint(stderr, "Error in stats loop.\n");
-        exit (status);
+        exit (status);
     }
     if (psListLength(results->list) == 0) {
         psErrorStackPrint(stderr, "No output.\n");
-        exit (status);
+        exit (status);
     }