[GNUnet-SVN] r14842 - in gauger: . bindings bindings/c bindings/java bindings/java/org bindings/java/org/gnunet bindings/java/org/gnunet/gauger

[gnunet]

Author: bartpolot
Date: 2011-04-04 14:55:17 +0200 (Mon, 04 Apr 2011)
New Revision: 14842

Added:
   gauger/bindings/
   gauger/bindings/c/
   gauger/bindings/c/gauger.h
   gauger/bindings/c/testgauger.c
   gauger/bindings/java/
   gauger/bindings/java/HelloGauger.class
   gauger/bindings/java/HelloGauger.java
   gauger/bindings/java/gauger.jar
   gauger/bindings/java/org/
   gauger/bindings/java/org/gnunet/
   gauger/bindings/java/org/gnunet/gauger/
   gauger/bindings/java/org/gnunet/gauger/Gauger.class
   gauger/bindings/java/org/gnunet/gauger/Gauger.java
Removed:
   gauger/gauger.h
Log:
Created bindings directory, added java bindings, added c demo code


Copied: gauger/bindings/c/gauger.h (from rev 14820, gauger/gauger.h)
===================================================================
--- gauger/bindings/c/gauger.h                          (rev 0)
+++ gauger/bindings/c/gauger.h  2011-04-04 12:55:17 UTC (rev 14842)
@@ -0,0 +1,22 @@
+/** ---------------------------------------------------------------------------
+ * This software is in the public domain, furnished "as is", without technical
+ * support, and with no warranty, express or implied, as to its usefulness for
+ * any purpose.
+ *
+ * gauger.h
+ * Interface for C programs to log remotely to a gauger server
+ *
+ * Author: Bartlomiej Polot
+ * -------------------------------------------------------------------------*/
+#ifndef __GAUGER_H__
+#define __GAUGER_H__
+
+#include <unistd.h>
+#include <stdio.h>
+#include <sys/wait.h>
+
+#define GAUGER(category, counter, value, unit) {char* __gauger_v[10];char 
__gauger_s[32];pid_t __gauger_p; 
if(!(__gauger_p=fork())){if(!fork()){sprintf(__gauger_s,"%llu", (unsigned long 
long) (value));__gauger_v[0] = "gauger-cli.py";__gauger_v[1] = 
"-n";__gauger_v[2] = counter;__gauger_v[3] = "-d";__gauger_v[4] = 
__gauger_s;__gauger_v[5] = "-u";__gauger_v[6] = unit;__gauger_v[7] = 
"-c";__gauger_v[8] = category;__gauger_v[9] = (char 
*)NULL;execvp("gauger-cli.py",__gauger_v);perror("gauger");_exit(1);}else{_exit(0);}}else{waitpid(__gauger_p,NULL,0);}}
+
+#define GAUGER_ID(category, counter, value, unit, id) {char* 
__gauger_v[12];char __gauger_s[32];pid_t __gauger_p; 
if(!(__gauger_p=fork())){if(!fork()){sprintf(__gauger_s,"%llu", (unsigned long 
long) (value));__gauger_v[0] = "gauger-cli.py";__gauger_v[1] = 
"-n";__gauger_v[2] = counter;__gauger_v[3] = "-d";__gauger_v[4] = 
__gauger_s;__gauger_v[5] = "-u";__gauger_v[6] = unit;__gauger_v[7] = 
"-i";__gauger_v[8] = id;__gauger_v[9] = "-c";__gauger_v[10] = 
category;__gauger_v[11] = (char 
*)NULL;execvp("gauger-cli.py",__gauger_v);perror("gauger");_exit(1);}else{_exit(0);}}else{waitpid(__gauger_p,NULL,0);}}
+
+#endif

Added: gauger/bindings/c/testgauger.c
===================================================================
--- gauger/bindings/c/testgauger.c                              (rev 0)
+++ gauger/bindings/c/testgauger.c      2011-04-04 12:55:17 UTC (rev 14842)
@@ -0,0 +1,6 @@
+#include "gauger.h"
+
+int main(int argc, char *argv[]) {
+    GAUGER("TestCategory", "DownloadSpeed", 150, "kb/s");
+    return 0;
+}

Added: gauger/bindings/java/HelloGauger.class
===================================================================
(Binary files differ)


Property changes on: gauger/bindings/java/HelloGauger.class
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: gauger/bindings/java/HelloGauger.java
===================================================================
--- gauger/bindings/java/HelloGauger.java                               (rev 0)
+++ gauger/bindings/java/HelloGauger.java       2011-04-04 12:55:17 UTC (rev 
14842)
@@ -0,0 +1,7 @@
+import static org.gnunet.gauger.Gauger.gauger;
+
+class HelloGauger {
+    public static void main(String[] args) {
+       gauger ("TestCategory", "Name", 42, "kb/s");
+    }
+}

Added: gauger/bindings/java/gauger.jar
===================================================================
(Binary files differ)


Property changes on: gauger/bindings/java/gauger.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: gauger/bindings/java/org/gnunet/gauger/Gauger.class
===================================================================
(Binary files differ)


Property changes on: gauger/bindings/java/org/gnunet/gauger/Gauger.class
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: gauger/bindings/java/org/gnunet/gauger/Gauger.java
===================================================================
--- gauger/bindings/java/org/gnunet/gauger/Gauger.java                          
(rev 0)
+++ gauger/bindings/java/org/gnunet/gauger/Gauger.java  2011-04-04 12:55:17 UTC 
(rev 14842)
@@ -0,0 +1,77 @@
+package org.gnunet.gauger;
+
+import java.io.IOException;
+
+/**
+ * Gauger binding for Java.
+ *
+ * @author Christian Grothoff
+ */
+public class Gauger {
+
+    /**
+    * Submit a value to the gauger server.
+    *
+    * @param component name of the subsystem
+    * @param name description for the value
+    * @param value numeric value
+    * @param unit unit for the value
+    */
+    public static void gauger (String component,
+                                String name,
+                                long value,
+                                String unit)
+    {
+        gauger (component, name, value, unit, -1);
+    }
+
+    /**
+    * Submit a value to the gauger server.
+    *
+    * @param component name of the subsystem
+    * @param name description for the value
+    * @param value numeric value
+    * @param unit unit for the value
+    * @param revision revision number to use
+    */
+    public static void gauger (String component,
+                               String name,
+                               long value,
+                               String unit,
+                               int revision)
+    {
+        Runtime rt = Runtime.getRuntime();
+        try
+        {
+            String[] cmds = (revision == -1) ?
+                new String[] {
+                "gauger-cli.py",
+                "-d",
+                "" + value,
+                "-u",
+                unit,
+                "-c",
+                component,
+                "-n",
+                name,
+            } :
+            new String[] {
+                "gauger-cli.py",
+                "-d",
+                "" + value,
+                "-u",
+                unit,
+                "-c",
+                component,
+                "-n",
+                name,
+                "-r",
+                "" + revision
+            };
+            rt.exec(cmds, null);
+        } catch (IOException io) {
+            // ignore errors
+        }
+    }
+
+}

Deleted: gauger/gauger.h
===================================================================
--- gauger/gauger.h     2011-04-04 12:10:42 UTC (rev 14841)
+++ gauger/gauger.h     2011-04-04 12:55:17 UTC (rev 14842)
@@ -1,22 +0,0 @@
-/** ---------------------------------------------------------------------------
- * This software is in the public domain, furnished "as is", without technical
- * support, and with no warranty, express or implied, as to its usefulness for
- * any purpose.
- *
- * gauger.h
- * Interface for C programs to log remotely to a gauger server
- *
- * Author: Bartlomiej Polot
- * -------------------------------------------------------------------------*/
-#ifndef __GAUGER_H__
-#define __GAUGER_H__
-
-#include <unistd.h>
-#include <stdio.h>
-#include <sys/wait.h>
-
-#define GAUGER(category, counter, value, unit) {char* __gauger_v[10];char 
__gauger_s[32];pid_t __gauger_p; 
if(!(__gauger_p=fork())){if(!fork()){sprintf(__gauger_s,"%llu", (unsigned long 
long) (value));__gauger_v[0] = "gauger-cli.py";__gauger_v[1] = 
"-n";__gauger_v[2] = counter;__gauger_v[3] = "-d";__gauger_v[4] = 
__gauger_s;__gauger_v[5] = "-u";__gauger_v[6] = unit;__gauger_v[7] = 
"-c";__gauger_v[8] = category;__gauger_v[9] = (char 
*)NULL;execvp("gauger-cli.py",__gauger_v);perror("gauger");_exit(1);}else{_exit(0);}}else{waitpid(__gauger_p,NULL,0);}}
-
-#define GAUGER_ID(category, counter, value, unit, id) {char* 
__gauger_v[12];char __gauger_s[32];pid_t __gauger_p; 
if(!(__gauger_p=fork())){if(!fork()){sprintf(__gauger_s,"%llu", (unsigned long 
long) (value));__gauger_v[0] = "gauger-cli.py";__gauger_v[1] = 
"-n";__gauger_v[2] = counter;__gauger_v[3] = "-d";__gauger_v[4] = 
__gauger_s;__gauger_v[5] = "-u";__gauger_v[6] = unit;__gauger_v[7] = 
"-i";__gauger_v[8] = id;__gauger_v[9] = "-c";__gauger_v[10] = 
category;__gauger_v[11] = (char 
*)NULL;execvp("gauger-cli.py",__gauger_v);perror("gauger");_exit(1);}else{_exit(0);}}else{waitpid(__gauger_p,NULL,0);}}
-
-#endif