From eff339d8fe59cfcb6fb5587a15375857c25eba4e Mon Sep 17 00:00:00 2001 From: IndigoFox Date: Sun, 2 Apr 2023 14:15:24 -0700 Subject: [PATCH] some touchups (version, call return) --- arma.go | 5 +-- armago_x64.h | 87 ---------------------------------------------------- 2 files changed, 3 insertions(+), 89 deletions(-) delete mode 100644 armago_x64.h diff --git a/arma.go b/arma.go index 02e7d9c..2daf304 100644 --- a/arma.go +++ b/arma.go @@ -29,7 +29,7 @@ func runExtensionCallback(name *C.char, function *C.char, data *C.char) C.int { //export goRVExtensionVersion func goRVExtensionVersion(output *C.char, outputsize C.size_t) { - result := C.CString("Version 1.0") + result := C.CString("Version 0.0.1") defer C.free(unsafe.Pointer(result)) var size = C.strlen(result) + 1 if size > outputsize { @@ -151,7 +151,7 @@ func goRVExtension(output *C.char, outputsize C.size_t, input *C.char) { go callBackExample() } else { // Return a result through callextension Arma call - temp := fmt.Sprintf("Cavmetrics: %s", C.GoString(input)) + temp := fmt.Sprintf("Rangermetrics: %s", C.GoString(input)) result := C.CString(temp) defer C.free(unsafe.Pointer(result)) var size = C.strlen(result) + 1 @@ -159,6 +159,7 @@ func goRVExtension(output *C.char, outputsize C.size_t, input *C.char) { size = outputsize } + // start a goroutine to send the data to influx go sendToInflux(C.GoString(input)) C.memmove(unsafe.Pointer(output), unsafe.Pointer(result), size) diff --git a/armago_x64.h b/armago_x64.h deleted file mode 100644 index 20a1926..0000000 --- a/armago_x64.h +++ /dev/null @@ -1,87 +0,0 @@ -/* Code generated by cmd/cgo; DO NOT EDIT. */ - -/* package github.com/7cav/a3-fone-home */ - - -#line 1 "cgo-builtin-export-prolog" - -#include /* for ptrdiff_t below */ - -#ifndef GO_CGO_EXPORT_PROLOGUE_H -#define GO_CGO_EXPORT_PROLOGUE_H - -#ifndef GO_CGO_GOSTRING_TYPEDEF -typedef struct { const char *p; ptrdiff_t n; } _GoString_; -#endif - -#endif - -/* Start of preamble from import "C" comments. */ - - -#line 3 "arma.go" - -#include -#include -#include - -#include "extensionCallback.h" - -#line 1 "cgo-generated-wrapper" - - -/* End of preamble from import "C" comments. */ - - -/* Start of boilerplate cgo prologue. */ -#line 1 "cgo-gcc-export-header-prolog" - -#ifndef GO_CGO_PROLOGUE_H -#define GO_CGO_PROLOGUE_H - -typedef signed char GoInt8; -typedef unsigned char GoUint8; -typedef short GoInt16; -typedef unsigned short GoUint16; -typedef int GoInt32; -typedef unsigned int GoUint32; -typedef long long GoInt64; -typedef unsigned long long GoUint64; -typedef GoInt64 GoInt; -typedef GoUint64 GoUint; -typedef __SIZE_TYPE__ GoUintptr; -typedef float GoFloat32; -typedef double GoFloat64; -typedef float _Complex GoComplex64; -typedef double _Complex GoComplex128; - -/* - static assertion to make sure the file is being used on architecture - at least with matching size of GoInt. -*/ -typedef char _check_for_64_bit_pointer_matching_GoInt[sizeof(void*)==64/8 ? 1:-1]; - -#ifndef GO_CGO_GOSTRING_TYPEDEF -typedef _GoString_ GoString; -#endif -typedef void *GoMap; -typedef void *GoChan; -typedef struct { void *t; void *v; } GoInterface; -typedef struct { void *data; GoInt len; GoInt cap; } GoSlice; - -#endif - -/* End of boilerplate cgo prologue. */ - -#ifdef __cplusplus -extern "C" { -#endif - -extern void goRVExtensionVersion(char* output, size_t outputsize); -extern GoInt goRVExtensionArgs(char* output, size_t outputsize, char* input, char** argv, int argc); -extern void goRVExtension(char* output, size_t outputsize, char* input); -extern void goRVExtensionRegisterCallback(extensionCallback fnc); - -#ifdef __cplusplus -} -#endif