[PATCH] Win32 for 1.4.5 and DotNetBindings
"Chris Larsen" <[email protected]>
| Newsgroups | gmane.comp.db.rrdtool.devel |
|---|---|
| Message-ID | <[email protected]> |
These patches are to update the Win32 Visual Studio build to 1.4.5 and fix some string marshaling bugs in the Dot Net binding client. Thanks! Sincerely, Chris Larsen Owner Euphoria Audio, LLC www.euphoriaaudio.com _______________________________________________ rrd-developers mailing list [email protected] https://lists.oetiker.ch/cgi-bin/listinfo/rrd-developers
dot_net_bindings_1_4_5.patch
(application/octet-stream, 40.6 KB)
Index: rrd_binding_test.cs
===================================================================
--- rrd_binding_test.cs (revision 2180)
+++ rrd_binding_test.cs (working copy)
@@ -2,6 +2,8 @@
* RRDLIB .NET Binding Test
*****************************************************************************
* Created 2010/06/29 by Chris Larsen
+ * Updated 2011/04/15 - Modified the string arrays to use pointers as the old
+ * automatic marshalling of strings didn't seem to work well with 1.4.5
*
* This project tests the .NET binding library by creating an rrd, inserting
* data, fetching data, creating graphs, dumping and exporting the data to
@@ -286,7 +288,7 @@
Int32 last_update = 0;
UInt32 ds_count = 0;
- string[] ds_names = new string[0];
+ string[] ds_names = new string[0];
string[] last_ds = new string[0];
rrd.Last_Update(path + "test_a.rrd", ref last_update, ref ds_count, ref ds_names, ref last_ds);
Console.WriteLine("Last Update: " + last_update);
Index: rrdlib.cs
===================================================================
--- rrdlib.cs (revision 2180)
+++ rrdlib.cs (working copy)
@@ -1,407 +1,441 @@
-/*****************************************************************************
- * RRDLIB .NET Binding
- *****************************************************************************
- * Created 2010/06/29 by Chris Larsen
- *
- * This .NET interface allows the use of Tobias Oetiker's awesome RRDtool
- * functions in .NET projects using the PInvoke method to load the rrdlib.dll
- * To use, please make sure that you place the rrdlib.dll in the same
- * directory as this dll, or change the "const string dll" to point to the
- * proper location. For documentation, please see the RRDtool website at:
- * http://oss.oetiker.ch/rrdtool/
- * For useage examples, please see the rrd_binding_test project.
- ****************************************************************************/
-using System;
-using System.Runtime.InteropServices;
-
-/// <summary>
-/// Contains data structures and methods for working with round robin databases.
-/// </summary>
-namespace dnrrdlib
-{
- /// <summary>
- /// Information about a particular RRD parameter. The key is the name of the parameter,
- /// type determines what kind of value we have, value is the value, and next is a
- /// pointer to another info object.
- /// </summary>
- [StructLayout(LayoutKind.Explicit, Pack = 1)]
- public struct rrd_info_t
- {
- [FieldOffset(0), MarshalAs(UnmanagedType.LPStr)]
- public string key;
- [FieldOffset(4)] // for 64 bit, set this to 8 and increment everyone else by 4
- public rrd_info_type_t type;
- [FieldOffset(8)]
- public rrd_infoval_t value;
- [FieldOffset(16)]
- public IntPtr next;
- }
-
- /// <summary>
- /// This is a chunk of data returned from an RRD object
- /// </summary>
- [StructLayout(LayoutKind.Sequential)]
- public struct rrd_blob_t
- {
- public UInt32 size; /* size of the blob */
- public IntPtr ptr; /* pointer */
- };
-
- /// <summary>
- /// This contains the actual data values for an rrd_info_t structure.
- /// NOTE: Only one of these will be valid per instance. Use the containing info_t's
- /// type field to deteremine which of these to read.
- /// NOTE: If the type is RD_I_STR, you have to marshal the string value yourself
- /// </summary>
- [StructLayout(LayoutKind.Explicit)]
- public struct rrd_infoval_t
- {
- [FieldOffset(0)]
- public UInt32 u_cnt;
- [FieldOffset(0)]
- public double u_val;
- [FieldOffset(0)]
- public IntPtr u_str;
- [FieldOffset(0)]
- public Int32 u_int;
- [FieldOffset(0)]
- public rrd_blob_t u_blo;
- };
-
- /// <summary>
- /// Different rrd_info_t value types
- /// </summary>
- public enum rrd_info_type_t
- {
- RD_I_VAL = 0,
- RD_I_CNT,
- RD_I_STR,
- RD_I_INT,
- RD_I_BLO
- };
-
- /// <summary>
- /// Direct bindings to the RRD Library for .NET applications. Uses the PInvoke method
- /// of accessing the rrdlib.dll file.
- /// </summary>
- public class rrd
- {
- // Set this path to the location of your "rrdlib.dll" file
- const string dll = @"rrdlib.dll";
-
- // IMPORTS - Main methods
- [DllImport(dll)] static extern Int32 rrd_create(Int32 argc, string[] argv);
- [DllImport(dll)] static extern Int32 rrd_create_r([MarshalAs(UnmanagedType.LPStr)] string filename,
- UInt32 pdp_step, Int32 last_up, Int32 argc, [MarshalAs(UnmanagedType.LPArray)] string[] argv);
- [DllImport(dll)] static extern IntPtr rrd_info_r(string filename);
- [DllImport(dll)] static extern void rrd_info_print(IntPtr data);
- [DllImport(dll)] static extern Int32 rrd_update(Int32 argc, string[] argv);
- [DllImport(dll)] static extern IntPtr rrd_update_v(Int32 argc, string[] argv);
- [DllImport(dll)] static extern Int32 rrd_update_r(string filename, string template, Int32 argc,
- string[] argv);
- /* Do not use this until someone adds the FILE structure */
- [DllImport(dll)] static extern Int32 rrd_graph(Int32 argc, string[] argv, ref string[] prdata,
- ref Int32 xsize, ref Int32 ysize, /* TODO - FILE, */ ref double ymin, ref double ymax);
- [DllImport(dll)] static extern Int32 rrd_graph_v(Int32 argc, string[] argv);
- [DllImport(dll)] static extern Int32 rrd_fetch(Int32 argc, string[] argv, ref Int32 start,
- ref Int32 end, ref UInt32 step, ref UInt32 ds_cnt, ref string[] ds_namv, ref IntPtr data);
- [DllImport(dll)] static extern Int32 rrd_first(Int32 argc, string[] argv);
- [DllImport(dll)] static extern Int32 rrd_first_r(string filename, Int32 rraindex);
- [DllImport(dll)] static extern Int32 rrd_last(Int32 argc, string[] argv);
- [DllImport(dll)] static extern Int32 rrd_last_r(string filename, Int32 rraindex);
- [DllImport(dll)] static extern Int32 rrd_lastupdate(Int32 argc, string[] argv);
- [DllImport(dll)] static extern Int32 rrd_lastupdate_r(string filename, ref Int32 ret_last_update,
- ref UInt32 ret_ds_count, ref string[] ret_ds_names, ref string[] ret_last_ds);
- [DllImport(dll)] static extern Int32 rrd_dump(Int32 argc, string[] argv);
- [DllImport(dll)] static extern Int32 rrd_dump_r(string filename, string outname);
- [DllImport(dll)] static extern Int32 rrd_xport(Int32 argc, string[] argv, Int32 unused,
- ref Int32 start, ref Int32 end, ref UInt32 step, ref UInt32 col_cnt,
- ref string[] leggend_v, ref IntPtr data);
- [DllImport(dll)] static extern Int32 rrd_restore(Int32 argc, string[] argv);
- [DllImport(dll)] static extern Int32 rrd_resize(Int32 argc, string[] argv);
- [DllImport(dll)] static extern Int32 rrd_tune(Int32 argc, string[] argv);
-
- // IMPORTS - Utility methods
- [DllImport(dll)] static extern string rrd_strversion();
- [DllImport(dll)] static extern Int32 rrd_random();
- [DllImport(dll)] static extern string rrd_get_error();
-
- // MAIN FUNCTIONS
-
- /// <summary>
- /// The create function of RRDtool lets you set up new Round Robin Database (RRD) files.
- /// The file is created at its final, full size and filled with *UNKNOWN* data.
- /// </summary>
- /// <param name="argv">String array of command line arguments</param>
- /// <returns>0 if successful, -1 if an error occurred</returns>
- public static int Create(string[] argv)
- {
- return rrd_create(argv.GetUpperBound(0) + 1, argv);
- }
-
- /// <summary>
- /// The create function of RRDtool lets you set up new Round Robin Database (RRD) files.
- /// The file is created at its final, full size and filled with *UNKNOWN* data.
- /// </summary>
- /// <param name="filename">A full path to the location where you want the rrd to reside</param>
- /// <param name="pdp_step">Specifies the base interval in seconds with which data will be fed into the RRD</param>
- /// <param name="last_up">Timestamp of the last update</param>
- /// <param name="argv">String array of command line arguments</param>
- /// <returns>0 if successful, -1 if an error occurred</returns>
- public static int Create(string filename, UInt32 pdp_step, Int32 last_up, string[] argv)
- {
- return rrd_create_r(filename, pdp_step, last_up, argv.GetUpperBound(0)+1, argv);
- }
-
- /// <summary>
- /// Returns a linked list of rrd_info_t objects that describe the rrd file.
- /// </summary>
- /// <param name="filename">Full path to the rrd file</param>
- /// <returns>An rrd_info_t object</returns>
- public static rrd_info_t Info(string filename)
- {
- if (filename.Length < 1)
- throw new Exception("Empty filename");
- IntPtr ptr = rrd_info_r(filename);
- if (ptr == IntPtr.Zero || (int)ptr < 1)
- throw new Exception("Unable to extract information from rrd");
- return (rrd_info_t)Marshal.PtrToStructure(ptr, typeof(rrd_info_t));
- }
-
- /// <summary>
- /// The update function feeds new data values into an RRD. The data is time aligned (interpolated)
- /// according to the properties of the RRD to which the data is written.
- /// </summary>
- /// <param name="argv">String array of command line arguments</param>
- /// <returns>0 if successful, -1 if an error occurred</returns>
- public static Int32 Update(string[] argv)
- {
- return rrd_update(argv.GetUpperBound(0) + 1, argv);
- }
-
- /// <summary>
- /// The update function feeds new data values into an RRD. The data is time aligned (interpolated)
- /// according to the properties of the RRD to which the data is written.
- /// </summary>
- /// <param name="argv">String array of command line arguments</param>
- /// <returns>An rrd_info_t pointer with information about the update</returns>
- public static IntPtr Update2(string[] argv)
- {
- return rrd_update_v(argv.GetUpperBound(0) + 1, argv);
- }
-
- /// <summary>
- /// The update function feeds new data values into an RRD. The data is time aligned (interpolated)
- /// according to the properties of the RRD to which the data is written.
- /// </summary>
- /// <param name="filename">Full path to the rrd to update</param>
- /// <param name="template">List of data sources to update and in which order</param>
- /// <param name="argv">String array of command line arguments</param>
- /// <returns>0 if successful, -1 if an error occurred</returns>
- public static Int32 Update(string filename, string template, string[] argv)
- {
- return rrd_update_r(filename, template, argv.GetUpperBound(0)+1, argv);
- }
-
- /// <summary>
- /// Generate a graph from an RRD file. Specify all the graph options in the string array as you
- /// normally would with the command line version.
- /// </summary>
- /// <param name="argv">String array of command line arguments</param>
- /// <returns>0 if successful, -1 if an error occurred</returns>
- public static Int32 Graph(string[] argv)
- {
- return rrd_graph_v(argv.GetUpperBound(0) + 1, argv);
- }
-
- /// <summary>
- /// Returns an array of values for the period specified from a given rrd.
- /// Specify your parameters in the argv array and check the referenced parameters for
- /// values returned from the rrd
- /// </summary>
- /// <param name="argv">String array of command line arguments (must include the filename)</param>
- /// <param name="start">Starting timestamp found in the rrd</param>
- /// <param name="end">Ending timestamp found in the rrd</param>
- /// <param name="step">The rrd's step value</param>
- /// <param name="ds_cnt">Number of data sources found</param>
- /// <param name="ds_namv">Names of data sources found</param>
- /// <param name="data">Values found (in double type)</param>
- /// <returns>0 if successful, -1 if an error occurred</returns>
- public static Int32 Fetch(string[] argv, ref Int32 start, ref Int32 end, ref UInt32 step,
- ref UInt32 ds_cnt, ref string[] ds_namv, ref IntPtr data)
- {
- return rrd_fetch(argv.GetUpperBound(0) + 1, argv, ref start, ref end, ref step, ref ds_cnt,
- ref ds_namv, ref data);
- }
-
- /// <summary>
- /// Returns the timestamp of the first value in the rrd given the rra index
- /// </summary>
- /// <param name="filename">Full path to the rrd file</param>
- /// <param name="rraindex">0 based index of the rra to get a value for</param>
- /// <returns>Unix timestamp if successful, -1 if an error occurred</returns>
- public static Int32 First(string filename, int rraindex)
- {
- return rrd_first_r(filename, rraindex);
- }
-
- /// <summary>
- /// Returns the timestamp of the first value in the rrd
- /// </summary>
- /// <param name="argv">String array of command line arguments</param>
- /// <returns>Unix timestamp if successful, -1 if an error occurred</returns>
- public static Int32 First(string[] argv)
- {
- return rrd_first(argv.GetUpperBound(0) + 1, argv);
- }
-
- /// <summary>
- /// Returns the timestamp of the last value in the rrd given the rra index
- /// </summary>
- /// <param name="filename"></param>
- /// <param name="filename">Full path to the rrd file</param>
- /// <param name="rraindex">0 based index of the rra to get a value for</param>
- /// <returns>Unix timestamp if successful, -1 if an error occurred</returns>
- public static Int32 Last(string filename, int rraindex)
- {
- return rrd_last_r(filename, rraindex);
- }
-
- /// <summary>
- /// Returns the timestamp of the last value in the rrd
- /// </summary>
- /// <param name="argv">String array of command line arguments</param>
- /// <returns>Unix timestamp if successful, -1 if an error occurred</returns>
- public static Int32 Last(string[] argv)
- {
- return rrd_last(argv.GetUpperBound(0) + 1, argv);
- }
-
- /// <summary>
- /// Finds the timestamp of the last updated value in the rrd
- /// </summary>
- /// <param name="filename">Full path to the rrd file</param>
- /// <param name="ret_last_update">Unix timestamp of the last update</param>
- /// <param name="ret_ds_count">Number of data sources found</param>
- /// <param name="ret_ds_names">Names of the data sources found</param>
- /// <param name="ret_last_ds">Name of the last data source found</param>
- /// <returns>0 if successful, -1 if an error occurred</returns>
- public static Int32 Last_Update(string filename, ref Int32 ret_last_update, ref UInt32 ret_ds_count,
- ref string[] ret_ds_names, ref string[] ret_last_ds)
- {
- return rrd_lastupdate_r(filename, ref ret_last_update, ref ret_ds_count, ref ret_ds_names,
- ref ret_last_ds);
- }
-
- /// <summary>
- /// Writes the contents of an rrd file to an XML file
- /// </summary>
- /// <param name="filename">Full path to the rrd file</param>
- /// <param name="outname">Full path to write the XML output</param>
- /// <returns>0 if successful, -1 if an error occurred</returns>
- public static Int32 Dump(string filename, string outname)
- {
- return rrd_dump_r(filename, outname);
- }
-
- /// <summary>
- /// Writes the contents of an rrd file to an XML file
- /// </summary>
- /// <param name="argv">String array of command line arguments</param>
- /// <returns>0 if successful, -1 if an error occurred</returns>
- public static Int32 Dump(string[] argv)
- {
- return rrd_dump(argv.GetUpperBound(0) + 1, argv);
- }
-
- /// <summary>
- /// Grabs the values from an rrd. Similar to fetch but enables merging of multiple
- /// rrds and calculations
- /// </summary>
- /// <param name="argv">String array of command line arguments</param>
- /// <param name="start">Starting timestamp found in the rrd</param>
- /// <param name="end">Ending timestamp found in the rrd</param>
- /// <param name="step">Step size found in the rrd</param>
- /// <param name="col_cnt">Number of data sources found in the rrd</param>
- /// <param name="leggend_v">Add a legend</param>
- /// <param name="data">Values from the rrd as double type</param>
- /// <returns>0 if successful, -1 if an error occurred</returns>
- public static Int32 Xport(string[] argv, ref Int32 start, ref Int32 end, ref UInt32 step,
- ref UInt32 col_cnt, ref string[] leggend_v, ref IntPtr data)
- {
- return rrd_xport(argv.GetUpperBound(0) + 1, argv, 0, ref start, ref end, ref step, ref col_cnt,
- ref leggend_v, ref data);
- }
-
- /// <summary>
- /// Creates an rrd from an XML data dump
- /// </summary>
- /// <param name="argv">String array of command line arguments</param>
- /// <returns>0 if successful, -1 if an error occurred</returns>
- public static Int32 Restore(string[] argv)
- {
- return rrd_restore(argv.GetUpperBound(0) + 1, argv);
- }
-
- /// <summary>
- /// Alters the size of an RRA and creates a new rrd in the dll's directory
- /// NOTE: The new rrd may return unexpected results if you are not very careful
- /// NOTE: This may crash in version 1.4.3
- /// </summary>
- /// <param name="argv">String array of command line arguments</param>
- /// <returns>0 if successful, -1 if an error occurred</returns>
- public static Int32 Resize(string[] argv)
- {
- return rrd_resize(argv.GetUpperBound(0) + 1, argv);
- }
-
- /// <summary>
- /// Modify the characteristics of an rrd
- /// </summary>
- /// <param name="argv">String array of command line arguments</param>
- /// <returns>0 if successful, -1 if an error occurred</returns>
- public static Int32 Tune(string[] argv)
- {
- return rrd_tune(argv.GetUpperBound(0) + 1, argv);
- }
-
- // UTILITIES
- /// <summary>
- /// Returns a string with the numeric version of the rrdlib build version
- /// </summary>
- /// <returns>A string with version information</returns>
- public static string Version()
- {
- return rrd_strversion();
- }
-
- /// <summary>
- /// Generates a random number for testing rrdlib
- /// </summary>
- /// <returns>A random integer</returns>
- public static int Random()
- {
- return rrd_random();
- }
-
- /// <summary>
- /// Returns the latest error from rrdlib
- /// </summary>
- /// <returns>A string with the error message, or an emtpy string if no error occurred</returns>
- public static string Get_Error()
- {
- return rrd_get_error();
- }
-
- /// <summary>
- /// Formats and prints information in the object to the standard output
- /// </summary>
- /// <param name="info">rrd_info_t object with data to print</param>
- public static void Info_Print(rrd_info_t info)
- {
- IntPtr newptr = Marshal.AllocHGlobal(Marshal.SizeOf(info));
- Marshal.StructureToPtr(info, newptr, true);
- rrd_info_print(newptr);
- }
- }
-}
+/*****************************************************************************
+ * RRDLIB .NET Binding
+ *****************************************************************************
+ * Created 2010/06/29 by Chris Larsen
+ *
+ * This .NET interface allows the use of Tobias Oetiker's awesome RRDtool
+ * functions in .NET projects using the PInvoke method to load the rrdlib.dll
+ * To use, please make sure that you place the rrdlib.dll in the same
+ * directory as this dll, or change the "const string dll" to point to the
+ * proper location. For documentation, please see the RRDtool website at:
+ * http://oss.oetiker.ch/rrdtool/
+ * For useage examples, please see the rrd_binding_test project.
+ ****************************************************************************/
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+
+/// <summary>
+/// Contains data structures and methods for working with round robin databases.
+/// </summary>
+namespace dnrrdlib
+{
+ /// <summary>
+ /// Information about a particular RRD parameter. The key is the name of the parameter,
+ /// type determines what kind of value we have, value is the value, and next is a
+ /// pointer to another info object.
+ /// </summary>
+ [StructLayout(LayoutKind.Explicit, Pack = 1)]
+ public struct rrd_info_t
+ {
+ [FieldOffset(0), MarshalAs(UnmanagedType.LPStr)]
+ public string key;
+ [FieldOffset(4)] // for 64 bit, set this to 8 and increment everyone else by 4
+ public rrd_info_type_t type;
+ [FieldOffset(8)]
+ public rrd_infoval_t value;
+ [FieldOffset(16)]
+ public IntPtr next;
+ }
+
+ /// <summary>
+ /// This is a chunk of data returned from an RRD object
+ /// </summary>
+ [StructLayout(LayoutKind.Sequential)]
+ public struct rrd_blob_t
+ {
+ public UInt32 size; /* size of the blob */
+ public IntPtr ptr; /* pointer */
+ };
+
+ /// <summary>
+ /// This contains the actual data values for an rrd_info_t structure.
+ /// NOTE: Only one of these will be valid per instance. Use the containing info_t's
+ /// type field to deteremine which of these to read.
+ /// NOTE: If the type is RD_I_STR, you have to marshal the string value yourself
+ /// </summary>
+ [StructLayout(LayoutKind.Explicit)]
+ public struct rrd_infoval_t
+ {
+ [FieldOffset(0)]
+ public UInt32 u_cnt;
+ [FieldOffset(0)]
+ public double u_val;
+ [FieldOffset(0)]
+ public IntPtr u_str;
+ [FieldOffset(0)]
+ public Int32 u_int;
+ [FieldOffset(0)]
+ public rrd_blob_t u_blo;
+ };
+
+ /// <summary>
+ /// Different rrd_info_t value types
+ /// </summary>
+ public enum rrd_info_type_t
+ {
+ RD_I_VAL = 0,
+ RD_I_CNT,
+ RD_I_STR,
+ RD_I_INT,
+ RD_I_BLO
+ };
+
+ /// <summary>
+ /// Direct bindings to the RRD Library for .NET applications. Uses the PInvoke method
+ /// of accessing the rrdlib.dll file.
+ /// </summary>
+ public class rrd
+ {
+ // Set this path to the location of your "rrdlib.dll" file
+ const string dll = @"C:\Programming\RRDTool\SVN\win32\DebugDLL\rrdlib.dll";
+
+ // IMPORTS - Main methods
+ [DllImport(dll)] static extern Int32 rrd_create(Int32 argc, string[] argv);
+ [DllImport(dll)] static extern Int32 rrd_create_r([MarshalAs(UnmanagedType.LPStr)] string filename,
+ UInt32 pdp_step, Int32 last_up, Int32 argc, [MarshalAs(UnmanagedType.LPArray)] string[] argv);
+ [DllImport(dll)] static extern IntPtr rrd_info_r(string filename);
+ [DllImport(dll)] static extern void rrd_info_print(IntPtr data);
+ [DllImport(dll)] static extern Int32 rrd_update(Int32 argc, string[] argv);
+ [DllImport(dll)] static extern IntPtr rrd_update_v(Int32 argc, string[] argv);
+ [DllImport(dll)] static extern Int32 rrd_update_r(string filename, string template, Int32 argc,
+ string[] argv);
+ /* Do not use this until someone adds the FILE structure */
+ [DllImport(dll)] static extern Int32 rrd_graph(Int32 argc, string[] argv, ref string[] prdata,
+ ref Int32 xsize, ref Int32 ysize, /* TODO - FILE, */ ref double ymin, ref double ymax);
+ [DllImport(dll)] static extern Int32 rrd_graph_v(Int32 argc, string[] argv);
+ [DllImport(dll)] static extern Int32 rrd_fetch(Int32 argc, string[] argv, ref Int32 start,
+ ref Int32 end, ref UInt32 step, [Out] out UInt32 ds_cnt, [Out] out IntPtr ds_namv, [Out] out IntPtr data);
+ [DllImport(dll)] static extern Int32 rrd_first(Int32 argc, string[] argv);
+ [DllImport(dll)] static extern Int32 rrd_first_r(string filename, Int32 rraindex);
+ [DllImport(dll)] static extern Int32 rrd_last(Int32 argc, string[] argv);
+ [DllImport(dll)] static extern Int32 rrd_last_r(string filename, Int32 rraindex);
+ [DllImport(dll)] static extern Int32 rrd_lastupdate(Int32 argc, string[] argv);
+ [DllImport(dll)] static extern Int32 rrd_lastupdate_r(string filename, ref Int32 ret_last_update,
+ ref UInt32 ret_ds_count, [Out] out IntPtr ret_ds_names, [Out] out IntPtr ret_last_ds);
+ [DllImport(dll)] static extern Int32 rrd_dump(Int32 argc, string[] argv);
+ [DllImport(dll)] static extern Int32 rrd_dump_r(string filename, string outname);
+ [DllImport(dll)] static extern Int32 rrd_xport(Int32 argc, string[] argv, Int32 unused,
+ ref Int32 start, ref Int32 end, ref UInt32 step, ref UInt32 col_cnt,
+ [Out] out IntPtr leggend_v, [Out] out IntPtr data);
+ [DllImport(dll)] static extern Int32 rrd_restore(Int32 argc, string[] argv);
+ [DllImport(dll)] static extern Int32 rrd_resize(Int32 argc, string[] argv);
+ [DllImport(dll)] static extern Int32 rrd_tune(Int32 argc, string[] argv);
+
+ // IMPORTS - Utility methods
+ [DllImport(dll)] static extern string rrd_strversion();
+ [DllImport(dll)] static extern Int32 rrd_random();
+ [DllImport(dll)] static extern IntPtr rrd_get_error();
+
+ // MAIN FUNCTIONS
+
+ /// <summary>
+ /// The create function of RRDtool lets you set up new Round Robin Database (RRD) files.
+ /// The file is created at its final, full size and filled with *UNKNOWN* data.
+ /// </summary>
+ /// <param name="argv">String array of command line arguments</param>
+ /// <returns>0 if successful, -1 if an error occurred</returns>
+ public static int Create(string[] argv)
+ {
+ return rrd_create(argv.GetUpperBound(0) + 1, argv);
+ }
+
+ /// <summary>
+ /// The create function of RRDtool lets you set up new Round Robin Database (RRD) files.
+ /// The file is created at its final, full size and filled with *UNKNOWN* data.
+ /// </summary>
+ /// <param name="filename">A full path to the location where you want the rrd to reside</param>
+ /// <param name="pdp_step">Specifies the base interval in seconds with which data will be fed into the RRD</param>
+ /// <param name="last_up">Timestamp of the last update</param>
+ /// <param name="argv">String array of command line arguments</param>
+ /// <returns>0 if successful, -1 if an error occurred</returns>
+ public static int Create(string filename, UInt32 pdp_step, Int32 last_up, string[] argv)
+ {
+ return rrd_create_r(filename, pdp_step, last_up, argv.GetUpperBound(0)+1, argv);
+ }
+
+ /// <summary>
+ /// Returns a linked list of rrd_info_t objects that describe the rrd file.
+ /// </summary>
+ /// <param name="filename">Full path to the rrd file</param>
+ /// <returns>An rrd_info_t object</returns>
+ public static rrd_info_t Info(string filename)
+ {
+ if (filename.Length < 1)
+ throw new Exception("Empty filename");
+ IntPtr ptr = rrd_info_r(filename);
+ if (ptr == IntPtr.Zero || (int)ptr < 1)
+ throw new Exception("Unable to extract information from rrd");
+ return (rrd_info_t)Marshal.PtrToStructure(ptr, typeof(rrd_info_t));
+ }
+
+ /// <summary>
+ /// The update function feeds new data values into an RRD. The data is time aligned (interpolated)
+ /// according to the properties of the RRD to which the data is written.
+ /// </summary>
+ /// <param name="argv">String array of command line arguments</param>
+ /// <returns>0 if successful, -1 if an error occurred</returns>
+ public static Int32 Update(string[] argv)
+ {
+ return rrd_update(argv.GetUpperBound(0) + 1, argv);
+ }
+
+ /// <summary>
+ /// The update function feeds new data values into an RRD. The data is time aligned (interpolated)
+ /// according to the properties of the RRD to which the data is written.
+ /// </summary>
+ /// <param name="argv">String array of command line arguments</param>
+ /// <returns>An rrd_info_t pointer with information about the update</returns>
+ public static IntPtr Update2(string[] argv)
+ {
+ return rrd_update_v(argv.GetUpperBound(0) + 1, argv);
+ }
+
+ /// <summary>
+ /// The update function feeds new data values into an RRD. The data is time aligned (interpolated)
+ /// according to the properties of the RRD to which the data is written.
+ /// </summary>
+ /// <param name="filename">Full path to the rrd to update</param>
+ /// <param name="template">List of data sources to update and in which order</param>
+ /// <param name="argv">String array of command line arguments</param>
+ /// <returns>0 if successful, -1 if an error occurred</returns>
+ public static Int32 Update(string filename, string template, string[] argv)
+ {
+ return rrd_update_r(filename, template, argv.GetUpperBound(0)+1, argv);
+ }
+
+ /// <summary>
+ /// Generate a graph from an RRD file. Specify all the graph options in the string array as you
+ /// normally would with the command line version.
+ /// </summary>
+ /// <param name="argv">String array of command line arguments</param>
+ /// <returns>0 if successful, -1 if an error occurred</returns>
+ public static Int32 Graph(string[] argv)
+ {
+ return rrd_graph_v(argv.GetUpperBound(0) + 1, argv);
+ }
+
+ /// <summary>
+ /// Returns an array of values for the period specified from a given rrd.
+ /// Specify your parameters in the argv array and check the referenced parameters for
+ /// values returned from the rrd
+ /// </summary>
+ /// <param name="argv">String array of command line arguments (must include the filename)</param>
+ /// <param name="start">Starting timestamp found in the rrd</param>
+ /// <param name="end">Ending timestamp found in the rrd</param>
+ /// <param name="step">The rrd's step value</param>
+ /// <param name="ds_cnt">Number of data sources found</param>
+ /// <param name="ds_namv">Names of data sources found</param>
+ /// <param name="data">Values found (in double type)</param>
+ /// <returns>0 if successful, -1 if an error occurred</returns>
+ public static Int32 Fetch(string[] argv, ref Int32 start, ref Int32 end, ref UInt32 step,
+ ref UInt32 ds_cnt, ref string[] ds_namv, ref IntPtr data)
+ {
+ IntPtr ptr = new IntPtr();
+ Int32 rv = rrd_fetch(argv.GetUpperBound(0) + 1, argv, ref start, ref end, ref step, out ds_cnt,
+ out ptr, out data);
+ ds_namv = GetStringArray(ptr, ds_cnt);
+ return rv;
+ }
+
+ /// <summary>
+ /// Returns the timestamp of the first value in the rrd given the rra index
+ /// </summary>
+ /// <param name="filename">Full path to the rrd file</param>
+ /// <param name="rraindex">0 based index of the rra to get a value for</param>
+ /// <returns>Unix timestamp if successful, -1 if an error occurred</returns>
+ public static Int32 First(string filename, int rraindex)
+ {
+ return rrd_first_r(filename, rraindex);
+ }
+
+ /// <summary>
+ /// Returns the timestamp of the first value in the rrd
+ /// </summary>
+ /// <param name="argv">String array of command line arguments</param>
+ /// <returns>Unix timestamp if successful, -1 if an error occurred</returns>
+ public static Int32 First(string[] argv)
+ {
+ return rrd_first(argv.GetUpperBound(0) + 1, argv);
+ }
+
+ /// <summary>
+ /// Returns the timestamp of the last value in the rrd given the rra index
+ /// </summary>
+ /// <param name="filename"></param>
+ /// <param name="filename">Full path to the rrd file</param>
+ /// <param name="rraindex">0 based index of the rra to get a value for</param>
+ /// <returns>Unix timestamp if successful, -1 if an error occurred</returns>
+ public static Int32 Last(string filename, int rraindex)
+ {
+ return rrd_last_r(filename, rraindex);
+ }
+
+ /// <summary>
+ /// Returns the timestamp of the last value in the rrd
+ /// </summary>
+ /// <param name="argv">String array of command line arguments</param>
+ /// <returns>Unix timestamp if successful, -1 if an error occurred</returns>
+ public static Int32 Last(string[] argv)
+ {
+ return rrd_last(argv.GetUpperBound(0) + 1, argv);
+ }
+
+ /// <summary>
+ /// Finds the timestamp of the last updated value in the rrd
+ /// </summary>
+ /// <param name="filename">Full path to the rrd file</param>
+ /// <param name="ret_last_update">Unix timestamp of the last update</param>
+ /// <param name="ret_ds_count">Number of data sources found</param>
+ /// <param name="ret_ds_names">Names of the data sources found</param>
+ /// <param name="ret_last_ds">Name of the last data source found</param>
+ /// <returns>0 if successful, -1 if an error occurred</returns>
+ public static Int32 Last_Update(string filename, ref Int32 ret_last_update, ref UInt32 ret_ds_count,
+ ref string[] ret_ds_names, ref string[] ret_last_ds)
+ {
+ IntPtr ds_names = new IntPtr();
+ IntPtr last_ds = new IntPtr();
+ Int32 rt = rrd_lastupdate_r(filename, ref ret_last_update, ref ret_ds_count, out ds_names,out last_ds);
+ ret_ds_names = GetStringArray(ds_names, ret_ds_count);
+ ret_last_ds = GetStringArray(last_ds, 1);
+ return rt;
+ }
+
+ /// <summary>
+ /// Writes the contents of an rrd file to an XML file
+ /// </summary>
+ /// <param name="filename">Full path to the rrd file</param>
+ /// <param name="outname">Full path to write the XML output</param>
+ /// <returns>0 if successful, -1 if an error occurred</returns>
+ public static Int32 Dump(string filename, string outname)
+ {
+ return rrd_dump_r(filename, outname);
+ }
+
+ /// <summary>
+ /// Writes the contents of an rrd file to an XML file
+ /// </summary>
+ /// <param name="argv">String array of command line arguments</param>
+ /// <returns>0 if successful, -1 if an error occurred</returns>
+ public static Int32 Dump(string[] argv)
+ {
+ return rrd_dump(argv.GetUpperBound(0) + 1, argv);
+ }
+
+ /// <summary>
+ /// Grabs the values from an rrd. Similar to fetch but enables merging of multiple
+ /// rrds and calculations
+ /// </summary>
+ /// <param name="argv">String array of command line arguments</param>
+ /// <param name="start">Starting timestamp found in the rrd</param>
+ /// <param name="end">Ending timestamp found in the rrd</param>
+ /// <param name="step">Step size found in the rrd</param>
+ /// <param name="col_cnt">Number of data sources found in the rrd</param>
+ /// <param name="leggend_v">Add a legend</param>
+ /// <param name="data">Values from the rrd as double type</param>
+ /// <returns>0 if successful, -1 if an error occurred</returns>
+ public static Int32 Xport(string[] argv, ref Int32 start, ref Int32 end, ref UInt32 step,
+ ref UInt32 col_cnt, ref string[] legend_v, ref IntPtr data)
+ {
+ IntPtr legend = new IntPtr();
+ Int32 rt = rrd_xport(argv.GetUpperBound(0) + 1, argv, 0, ref start, ref end, ref step, ref col_cnt,
+ out legend, out data);
+ legend_v = GetStringArray(legend, col_cnt);
+ return rt;
+ }
+
+ /// <summary>
+ /// Creates an rrd from an XML data dump
+ /// </summary>
+ /// <param name="argv">String array of command line arguments</param>
+ /// <returns>0 if successful, -1 if an error occurred</returns>
+ public static Int32 Restore(string[] argv)
+ {
+ return rrd_restore(argv.GetUpperBound(0) + 1, argv);
+ }
+
+ /// <summary>
+ /// Alters the size of an RRA and creates a new rrd in the dll's directory
+ /// NOTE: The new rrd may return unexpected results if you are not very careful
+ /// NOTE: This may crash in version 1.4.3
+ /// </summary>
+ /// <param name="argv">String array of command line arguments</param>
+ /// <returns>0 if successful, -1 if an error occurred</returns>
+ public static Int32 Resize(string[] argv)
+ {
+ return rrd_resize(argv.GetUpperBound(0) + 1, argv);
+ }
+
+ /// <summary>
+ /// Modify the characteristics of an rrd
+ /// </summary>
+ /// <param name="argv">String array of command line arguments</param>
+ /// <returns>0 if successful, -1 if an error occurred</returns>
+ public static Int32 Tune(string[] argv)
+ {
+ return rrd_tune(argv.GetUpperBound(0) + 1, argv);
+ }
+
+ // UTILITIES
+ /// <summary>
+ /// Returns a string with the numeric version of the rrdlib build version
+ /// </summary>
+ /// <returns>A string with version information</returns>
+ public static string Version()
+ {
+ return rrd_strversion();
+ }
+
+ /// <summary>
+ /// Generates a random number for testing rrdlib
+ /// </summary>
+ /// <returns>A random integer</returns>
+ public static int Random()
+ {
+ return rrd_random();
+ }
+
+ /// <summary>
+ /// Returns the latest error from rrdlib
+ /// </summary>
+ /// <returns>A string with the error message, or an emtpy string if no error occurred</returns>
+ public static string Get_Error()
+ {
+ IntPtr ptr = rrd_get_error();
+ if (ptr == IntPtr.Zero)
+ return "";
+ return Marshal.PtrToStringAnsi(ptr);
+ }
+
+ /// <summary>
+ /// Formats and prints information in the object to the standard output
+ /// </summary>
+ /// <param name="info">rrd_info_t object with data to print</param>
+ public static void Info_Print(rrd_info_t info)
+ {
+ IntPtr newptr = Marshal.AllocHGlobal(Marshal.SizeOf(info));
+ Marshal.StructureToPtr(info, newptr, true);
+ rrd_info_print(newptr);
+ }
+
+ /// <summary>
+ /// Converts a Char ** array of characters from the RRDLib returned as an IntPtr and converts
+ /// it to a String array given the number of items in the ptr array.
+ /// Re: http://stackoverflow.com/questions/1498931/marshalling-array-of-strings-to-char-in-c-must-be-quite-easy-if-you-know-ho
+ /// </summary>
+ /// <param name="ptr">Pointer to a character array returned from the RRDLib</param>
+ /// <param name="size">Number of items in the character array (not the number of characters)</param>
+ /// <returns>A string array</returns>
+ private static string[] GetStringArray(IntPtr ptr, UInt32 size)
+ {
+ var list = new List<string>();
+ for (int i = 0; i < size; i++)
+ {
+ var strPtr = (IntPtr)Marshal.PtrToStructure(ptr, typeof(IntPtr));
+ list.Add(Marshal.PtrToStringAnsi(strPtr));
+ ptr = new IntPtr(ptr.ToInt64() + IntPtr.Size);
+ }
+ return list.ToArray();
+ }
+ }
+}
rrd_client_h_update_win32.patch
(application/octet-stream, 564 B)
Index: rrd_client.h
===================================================================
--- rrd_client.h (revision 2180)
+++ rrd_client.h (working copy)
@@ -93,11 +93,16 @@
rrd_value_t **ret_data);
#else
+# define rrdc_create(a,b,c,d,e,f) 0
# define rrdc_flush_if_daemon(a,b) 0
# define rrdc_connect(a) 0
# define rrdc_is_connected(a) 0
# define rrdc_flush(a) 0
# define rrdc_update(a,b,c) 0
+# define rrdc_last(a) 0
+# define rrdc_first(a,b) 0
+# define rrdc_fetch(a,b,c,d,e,f,g,h) 0
+# define rrdc_info(a) 0
#endif
struct rrdc_stats_s
win32_1_4_5.patch
(application/octet-stream, 24 KB)
Index: config.h
===================================================================
--- config.h (revision 2180)
+++ config.h (working copy)
@@ -29,9 +29,9 @@
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
-#define NUMVERS 1.4030
+#define NUMVERS 1.4050
#define PACKAGE_NAME "rrdtool"
-#define PACKAGE_VERSION "1.4.3"
+#define PACKAGE_VERSION "1.4.5"
#define PACKAGE_STRING PACKAGE_NAME " " PACKAGE_VERSION
#define isinf(a) (_fpclass(a) == _FPCLASS_NINF || _fpclass(a) == _FPCLASS_PINF)
Index: rrdlib.vcproj
===================================================================
--- rrdlib.vcproj (revision 2180)
+++ rrdlib.vcproj (working copy)
@@ -1,527 +1,532 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="rrdlib"
- ProjectGUID="{CC158E1D-1364-43CA-9B2D-4AF54225C7CA}"
- RootNamespace="rrdlib"
- Keyword="Win32Proj"
- TargetFrameworkVersion="196613"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="4"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".;../contrib/include/cairo;"../contrib/include/pango-1.0";"../contrib/include/glib-2.0";"../contrib/lib/glib-2.0/include";../contrib/include;../contrib/include/libpng12;../contrib/include/libxml2"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USE_32BIT_TIME_T"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="2"
- DisableSpecificWarnings="4996"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib libpng.lib zdll.lib glib-2.0.lib gobject-2.0.lib libxml2.lib"
- AdditionalLibraryDirectories="../contrib/lib"
- ModuleDefinitionFile=""
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="4"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=".;../../contrib/cairo/include/cairo;"../../contrib/pango/include/pango-1.0";"../../contrib/glib/include/glib-2.0";"../../contrib/glib/lib/glib-2.0/include";../../contrib/libpng/include;../../contrib/zlib/include;../../contrib/libxml2/include/libxml2"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough="precompiled.h"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="2"
- DisableSpecificWarnings="4996"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib libpng.lib zdll.lib glib-2.0.lib gobject-2.0.lib libxml2.lib"
- AdditionalLibraryDirectories="../../contrib/cairo/lib;../../contrib/pango/lib;../../contrib/glib/lib;../../contrib/libpng/lib;../../contrib/zlib/lib;../../contrib/libxml2/lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="DebugDLL|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".;../contrib/include/cairo;"../contrib/include/pango-1.0";"../contrib/include/glib-2.0";"../contrib/lib/glib-2.0/include";../contrib/include;../contrib/include/libpng12;../contrib/include/libxml2"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;DEBUG;_USE_32BIT_TIME_T"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="2"
- DisableSpecificWarnings="4996"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="cairo.lib glib-2.0.lib gobject-2.0.lib libpng.lib libxml2.lib pango-1.0.lib pangocairo-1.0.lib"
- AdditionalLibraryDirectories="../contrib/lib"
- ModuleDefinitionFile="rrdlib.def"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Static Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="4"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".;../contrib/include/cairo;"../contrib/include/pango-1.0";"../contrib/include/glib-2.0";"../contrib/lib/glib-2.0/include";../contrib/include;../contrib/include/libpng12;../contrib/include/libxml2"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="2"
- DisableSpecificWarnings="4996"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib libpng.lib zdll.lib glib-2.0.lib gobject-2.0.lib libxml2.lib"
- AdditionalLibraryDirectories="../contrib/lib"
- ModuleDefinitionFile=""
- IgnoreDefaultLibraryNames="LIBCMTD.lib;LIBCMT.lib"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\src\hash_32.c"
- >
- </File>
- <File
- RelativePath="..\src\plbasename.c"
- >
- </File>
- <File
- RelativePath="..\src\pngsize.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_create.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_diff.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_dump.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_error.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_fetch.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_first.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_format.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_getopt.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_getopt1.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_gfx.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_graph.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_graph_helper.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_hw.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_hw_math.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_hw_update.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_info.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_last.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_lastupdate.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_nan_inf.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_open.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_parsetime.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_resize.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_restore.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_rpncalc.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_thread_safe_nt.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_tune.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_update.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_utils.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_version.c"
- >
- </File>
- <File
- RelativePath="..\src\rrd_xport.c"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath="..\win32\config.h"
- >
- </File>
- <File
- RelativePath="..\src\fnv.h"
- >
- </File>
- <File
- RelativePath="..\src\plbasename.h"
- >
- </File>
- <File
- RelativePath="..\src\rrd.h"
- >
- </File>
- <File
- RelativePath="..\src\rrd_format.h"
- >
- </File>
- <File
- RelativePath="..\src\rrd_getopt.h"
- >
- </File>
- <File
- RelativePath="..\src\rrd_graph.h"
- >
- </File>
- <File
- RelativePath="..\src\rrd_hw.h"
- >
- </File>
- <File
- RelativePath="..\src\rrd_hw_math.h"
- >
- </File>
- <File
- RelativePath="..\src\rrd_hw_update.h"
- >
- </File>
- <File
- RelativePath="..\src\rrd_i18n.h"
- >
- </File>
- <File
- RelativePath="..\src\rrd_is_thread_safe.h"
- >
- </File>
- <File
- RelativePath="..\src\rrd_parsetime.h"
- >
- </File>
- <File
- RelativePath="..\src\rrd_rpncalc.h"
- >
- </File>
- <File
- RelativePath="..\src\rrd_tool.h"
- >
- </File>
- <File
- RelativePath="..\src\rrd_xport.h"
- >
- </File>
- <File
- RelativePath="..\src\unused.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- <File
- RelativePath=".\rrdlib.def"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="rrdlib"
+ ProjectGUID="{CC158E1D-1364-43CA-9B2D-4AF54225C7CA}"
+ RootNamespace="rrdlib"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="196613"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=".;../contrib/include/cairo;"../contrib/include/pango-1.0";"../contrib/include/glib-2.0";"../contrib/lib/glib-2.0/include";../contrib/include;../contrib/include/libpng12;../contrib/include/libxml2"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USE_32BIT_TIME_T"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="2"
+ DisableSpecificWarnings="4996"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ LinkLibraryDependencies="true"
+ AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib libpng.lib zdll.lib glib-2.0.lib gobject-2.0.lib libxml2.lib"
+ AdditionalLibraryDirectories="../contrib/lib"
+ ModuleDefinitionFile=""
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ EnableIntrinsicFunctions="true"
+ AdditionalIncludeDirectories=".;../../contrib/cairo/include/cairo;"../../contrib/pango/include/pango-1.0";"../../contrib/glib/include/glib-2.0";"../../contrib/glib/lib/glib-2.0/include";../../contrib/libpng/include;../../contrib/zlib/include;../../contrib/libxml2/include/libxml2"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough="precompiled.h"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="2"
+ DisableSpecificWarnings="4996"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib libpng.lib zdll.lib glib-2.0.lib gobject-2.0.lib libxml2.lib"
+ AdditionalLibraryDirectories="../../contrib/cairo/lib;../../contrib/pango/lib;../../contrib/glib/lib;../../contrib/libpng/lib;../../contrib/zlib/lib;../../contrib/libxml2/lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="DebugDLL|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=".;../contrib/include/cairo;"../contrib/include/pango-1.0";"../contrib/include/glib-2.0";"../contrib/lib/glib-2.0/include";../contrib/include;../contrib/include/libpng12;../contrib/include/libxml2"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;DEBUG;_USE_32BIT_TIME_T"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="2"
+ DisableSpecificWarnings="4996"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="cairo.lib glib-2.0.lib gobject-2.0.lib libpng.lib libxml2.lib pango-1.0.lib pangocairo-1.0.lib"
+ AdditionalLibraryDirectories="../contrib/lib"
+ ModuleDefinitionFile="rrdlib.def"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Static Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="4"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=".;../contrib/include/cairo;"../contrib/include/pango-1.0";"../contrib/include/glib-2.0";"../contrib/lib/glib-2.0/include";../contrib/include;../contrib/include/libpng12;../contrib/include/libxml2"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="2"
+ DisableSpecificWarnings="4996"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib libpng.lib zdll.lib glib-2.0.lib gobject-2.0.lib libxml2.lib"
+ AdditionalLibraryDirectories="../contrib/lib"
+ ModuleDefinitionFile=""
+ IgnoreDefaultLibraryNames="LIBCMTD.lib;LIBCMT.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\src\hash_32.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\plbasename.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\pngsize.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_create.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_diff.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_dump.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_error.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_fetch.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_first.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_format.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_getopt.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_getopt1.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_gfx.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_graph.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_graph_helper.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_hw.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_hw_math.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_hw_update.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_info.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_last.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_lastupdate.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_nan_inf.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_open.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_parsetime.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_resize.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_restore.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_rpncalc.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_thread_safe_nt.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_tune.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_update.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_utils.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_version.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_xport.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File
+ RelativePath="..\win32\config.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\fnv.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\plbasename.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_client.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_format.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_getopt.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_graph.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_hw.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_hw_math.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_hw_update.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_i18n.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_is_thread_safe.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_parsetime.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_rpncalc.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_tool.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\rrd_xport.h"
+ >
+ </File>
+ <File
+ RelativePath="..\src\unused.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ <File
+ RelativePath=".\rrdlib.def"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>