Verious bug fixes, and started wrapping the library calls

The ability to pass pointers to flb_input, flb_filter and flb_output was broken. I have it correctly permitting undef values for NULLs now. then I wrapped the API in LibFluentBit with more perlish methods, including tracking whether the engine is started so that it can be cleanly shut down. Then I wrote a simple logger object that writes timestamped messages into the 'lib' input. Added some unit tests, and it seems to be working.

Author: nrdvana

LibFluentBit.xs

@@ -8,8 +8,9 @@
 #ifndef newSVivpv
 static SV *newSVivpv(IV ival, const char *pval) {
  SV *s= newSVpv(pval, 0);
- SvIOK_on(s);
+ SvUPGRADE(s, SVt_PVIV);
  SvIV_set(s, ival);
+ SvIOK_on(s);
  return s;
 }
 #endif
@@ -43,10 +44,16 @@ flb_service_set(ctx, ...)
 RETVAL
 
 int
-flb_input(ctx, name, data=NULL)
+flb_input(ctx, name, data_sv=NULL)
  flb_ctx_t *ctx
  const char *name
- void *data
+ SV *data_sv
+ INIT:
+ void *data= data_sv && SvOK(data_sv)? (void*)SvIV(data_sv) : NULL;
+ CODE:
+ RETVAL= flb_input(ctx, name, data);
+ OUTPUT:
+ RETVAL
 
 int
 flb_input_set(ctx, in_ffd, ...)
@@ -73,10 +80,16 @@ flb_input_set(ctx, in_ffd, ...)
 RETVAL
 
 int
-flb_filter(ctx, name, data=NULL)
+flb_filter(ctx, name, data_sv=NULL)
  flb_ctx_t *ctx
  const char *name
- void *data
+ SV *data_sv
+ INIT:
+ void *data= data_sv && SvOK(data_sv)? (void*)SvIV(data_sv) : NULL;
+ CODE:
+ RETVAL= flb_filter(ctx, name, data);
+ OUTPUT:
+ RETVAL
 
 int
 flb_filter_set(ctx, flt_ffd, ...)
@@ -103,10 +116,16 @@ flb_filter_set(ctx, flt_ffd, ...)
 RETVAL
 
 int
-flb_output(ctx, name, data=NULL)
+flb_output(ctx, name, data_sv=NULL)
  flb_ctx_t *ctx
  const char *name
- void *data
+ SV *data_sv
+ INIT:
+ void *data= data_sv && SvOK(data_sv)? (void*)SvIV(data_sv) : NULL;
+ CODE:
+ RETVAL= flb_output(ctx, name, data);
+ OUTPUT:
+ RETVAL
 
 int
 flb_output_set(ctx, out_ffd, ...)
@@ -148,7 +167,7 @@ flb_destroy(obj)
  CODE:
  if (ctx) {
  flb_destroy(ctx);
- PerlFluentBit_set_ctx_mg(obj, NULL); // unset magic so that can't be called twice
+ PerlFluentBit_set_ctx_mg(obj, NULL);
  }
 
 int

lib/Fluent/LibFluentBit.pm

@@ -1,11 +1,61 @@
 package Fluent::LibFluentBit;
 use strict;
 use warnings;
+use Carp;
+use JSON::MaybeXS;
 
 # VERSION
 # ABSTRACT: Perl interface to libfluent-bit.so
 
 require XSLoader;
 XSLoader::load('Fluent::LibFluentBit', $Fluent::LibFluentBit::VERSION);
 
+my $default_instance;
+sub default_instance {
+ $default_instance //= Fluent::LibFluentBit->new;
+}
+
+sub new {
+ my $class= shift;
+ my $self= Fluent::LibFluentBit::flb_create();
+ %$self= (@_ == 1 && ref $_[0] eq 'HASH')? %{$_[0]} : @_;
+ $self->{started}= !1;
+ return $self;
+}
+
+sub started { $_[0]{started} }
+
+sub start {
+ my $self= shift;
+ unless ($self->{started}) {
+ $self->flb_start;
+ $self->{started}= 1;
+ }
+}
+
+sub stop {
+ my $self= shift;
+ if ($self->{started}) {
+ $self->flb_stop;
+ $self->{started}= 0;
+ }
+}
+
+sub DESTROY {
+ my $self= shift;
+ $self->stop;
+ $self->flb_destroy;
+}
+
+sub new_logger {
+ my $self= shift;
+ require Fluent::LibFluentBit::Logger;
+ $self->start unless $self->{started};
+ Fluent::LibFluentBit::Logger->new(context => $self, @_);
+}
+
+END {
+ undef $default_instance;
+}
+
 1;

lib/Fluent/LibFluentBit/Logger.pm

@@ -0,0 +1,37 @@
+package Fluent::LibFluentBit::Logger;
+use strict;
+use warnings;
+use Carp;
+use JSON::MaybeXS;
+
+sub new {
+ my $class= shift;
+ my %attrs= @_;
+ defined $attrs{context} or croak "Missing required attribute 'context'";
+ $attrs{ffd} //= $attrs{context}->flb_input("lib");
+ $attrs{ffd} >= 0 or croak "Can't create 'lib' input to libfluent-bit";
+ bless \%attrs, $class;
+}
+
+sub _log_data {
+ my ($self, $data, $level)= @_;
+ $data= { message => $data } unless ref $data eq 'HASH';
+ my $code= $self->{context}->flb_lib_push($self->{ffd}, encode_json([ time, $data ]));
+ $code >= 0 or croak "flb_lib_push failed: $code";
+ return $self;
+}
+
+sub info {
+ $_[0]->_log_data( $_[1], 'info' );
+}
+
+sub warn {
+ $_[0]->_log_data( $_[1], 'warn' );
+}
+
+sub error {
+ $_[0]->_log_data( $_[1], 'error' );
+}
+
+1;
+

t/01-init.t

@@ -4,6 +4,9 @@ use Test::More;
 
 use_ok( 'Fluent::LibFluentBit' ) or BAIL_OUT;
 
+is( Fluent::LibFluentBit::FLB_LIB_OK(), 'FLB_LIB_OK', 'constants by name' );
+is( 0+Fluent::LibFluentBit::FLB_LIB_OK(), 1, 'constants by value' );
+
 ok( my $flb= Fluent::LibFluentBit::flb_create(), 'flb_create' );
 local $@;
 is( eval { $flb->flb_destroy; 1; }, 1, 'flb_destroy' )

t/02-simple-logging.t

@@ -0,0 +1,15 @@
+use strict;
+use warnings;
+use Test::More;
+use Fluent::LibFluentBit;
+
+my $y2020= 1577836800;
+ok( my $flb= Fluent::LibFluentBit::flb_create(), 'flb_create' );
+ok( (my $in_ffd= $flb->flb_input("lib", undef)) >= 0, 'flb_input' );
+ok( (my $out_ffd= $flb->flb_output("stdout", undef)) >= 0, 'flb_output' );
+ok( $flb->flb_start >= 0, 'flb_start' );
+ok( $flb->flb_lib_push($in_ffd, qq|[ $y2020, { "message":"Hello World" } ]|) >= 0, 'flb_lib_push' );
+ok( $flb->flb_stop >= 0, 'flb_stop' );
+ok( eval { undef $flb; 1; }, 'flb_destroy via undef' );
+
+done_testing;

t/03-logger-obj.t

@@ -0,0 +1,11 @@
+use strict;
+use warnings;
+use Test::More;
+use Fluent::LibFluentBit;
+
+ok( my $flb= Fluent::LibFluentBit->default_instance, 'default_instance' );
+ok( my $logger= $flb->new_logger, 'new_logger' );
+ok( $logger->error('test'), "error('test')" );
+undef $flb;
+
+done_testing;