Refactoring: Moved LoadTimingData() into Greenpak4Device

azonenberg · azonenberg · commit daa9f7d987d2 · 2017-06-06T01:16:32.000-07:00
diff --git a/src/gp4tchar/main.cpp b/src/gp4tchar/main.cpp
@@ -28,8 +28,6 @@ using namespace std;
 
 DevkitCalibration g_devkitCal;
 
-bool LoadTimingData(string fname);
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Entry point
 
@@ -126,8 +124,11 @@ int main(int argc, char* argv[])
 	//Load timing data from disk
 	LogNotice("Loading timing data...\n");
 	string tfname = "timing.json";
-	if(!LoadTimingData(tfname))
+	if(!g_calDevice.LoadTimingData(tfname))
+	{
+		LogWarning("Couldn't load existing timing data file\n");
 		return 1;
+	}
 
 	//Measure delay through each element
 	/*
@@ -163,63 +164,6 @@ int main(int argc, char* argv[])
 	return 0;
 }
 
-bool LoadTimingData(string fname)
-{
-	//Open the file (non-existence is a legal no-op, return success silently)
-	FILE* fp = fopen(fname.c_str(), "rb");
-	if(fp == NULL)
-		return true;
-	if(0 != fseek(fp, 0, SEEK_END))
-	{
-		LogError("Failed to seek to end of timing data file %s\n", fname.c_str());
-		fclose(fp);
-		return false;
-	}
-	size_t len = ftell(fp);
-	if(0 != fseek(fp, 0, SEEK_SET))
-	{
-		LogError("Failed to seek to start of timing data file %s\n", fname.c_str());
-		return false;
-	}
-	char* json_string = new char[len + 1];
-	json_string[len] = '\0';
-	if(len != fread(json_string, 1, len, fp))
-	{
-		LogError("Failed to read contents of timing data file %s\n", fname.c_str());
-		delete[] json_string;
-		fclose(fp);
-		return false;
-	}
-	fclose(fp);
-
-	//Parse the JSON
-	json_tokener* tok = json_tokener_new();
-	if(!tok)
-	{
-		LogError("Failed to create JSON tokenizer object\n");
-		delete[] json_string;
-		return false;
-	}
-	json_tokener_error err;
-	json_object* object = json_tokener_parse_verbose(json_string, &err);
-	if(NULL == object)
-	{
-		const char* desc = json_tokener_error_desc(err);
-		LogError("JSON parsing failed (err = %s)\n", desc);
-		delete[] json_string;
-		return false;
-	}
-
-	//Load stuff
-	if(!g_calDevice.LoadTimingData(object))
-		return false;
-
-	//Done
-	json_object_put(object);
-	json_tokener_free(tok);
-	return true;
-}
-
 void WaitForKeyPress()
 {
 	LogNotice("Press any key to continue . . .\n");
diff --git a/src/greenpak4/Greenpak4Device.cpp b/src/greenpak4/Greenpak4Device.cpp
@@ -1299,6 +1299,63 @@ void Greenpak4Device::SaveTimingData(string fname)
 	fclose(fp);
 }
 
+bool Greenpak4Device::LoadTimingData(string fname)
+{
+	//Read it
+	FILE* fp = fopen(fname.c_str(), "rb");
+	if(fp == NULL)
+		return false;
+	if(0 != fseek(fp, 0, SEEK_END))
+	{
+		LogError("Failed to seek to end of timing data file %s\n", fname.c_str());
+		fclose(fp);
+		return false;
+	}
+	size_t len = ftell(fp);
+	if(0 != fseek(fp, 0, SEEK_SET))
+	{
+		LogError("Failed to seek to start of timing data file %s\n", fname.c_str());
+		return false;
+	}
+	char* json_string = new char[len + 1];
+	json_string[len] = '\0';
+	if(len != fread(json_string, 1, len, fp))
+	{
+		LogError("Failed to read contents of timing data file %s\n", fname.c_str());
+		delete[] json_string;
+		fclose(fp);
+		return false;
+	}
+	fclose(fp);
+
+	//Parse the JSON
+	json_tokener* tok = json_tokener_new();
+	if(!tok)
+	{
+		LogError("Failed to create JSON tokenizer object\n");
+		delete[] json_string;
+		return false;
+	}
+	json_tokener_error err;
+	json_object* object = json_tokener_parse_verbose(json_string, &err);
+	if(NULL == object)
+	{
+		const char* desc = json_tokener_error_desc(err);
+		LogError("JSON parsing failed (err = %s)\n", desc);
+		delete[] json_string;
+		return false;
+	}
+
+	//Load stuff
+	if(!LoadTimingData(object))
+		return false;
+
+	//Done
+	json_object_put(object);
+	json_tokener_free(tok);
+	return true;
+}
+
 bool Greenpak4Device::LoadTimingData(json_object* object)
 {
 	//Make a map of description -> entity
diff --git a/src/greenpak4/Greenpak4Device.h b/src/greenpak4/Greenpak4Device.h
@@ -334,6 +334,7 @@ class Greenpak4Device
 	void PrintTimingData() const;
 	void SaveTimingData(std::string fname);
 	bool LoadTimingData(json_object* object);
+	bool LoadTimingData(std::string fname);
 
 protected:
 
