Commit d7262b98 authored by Greg Williams's avatar Greg Williams
Browse files

Integrated new KineticRuby with integrated Kinetic Device test server. 

Fixed some memory management issues.
Added LogPrintf and LOGF macro for direct logging of formatted messages to kinetic_logger.
parent 1e5c8d74

Gemfile.lock

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ GEM 
    addressable (2.3.6)

    backports (3.6.0)

    beefcake (0.5.0)

    ceedling (0.15.1)

    ceedling (0.15.6)

      rake (>= 0.8.7)

      thor (>= 0.14.5)

    coderay (1.1.0)
@@ -25,7 +25,7 @@ GEM 
      net-http-pipeline

    highline (1.6.21)

    json (1.8.1)

    kinetic-ruby (0.3.8)

    kinetic-ruby (0.6.0)

      beefcake

      rake (>= 0.9.2.2)

      rspec

Rakefile

+27 −5
Original line number Diff line number Diff line 
TEAMCITY_BUILD = !ENV['TEAMCITY_PROJECT_NAME'].nil?



require 'kinetic-ruby'

load 'kinetic-ruby.rake'

KineticRuby::Rake::load_tasks()



require 'ceedling'

Ceedling.load_project(config: './project.yml')
@@ -169,7 +169,30 @@ namespace :java_sim do 


end



task 'test/integration/test_kinetic_socket.c' => ['server:start']

namespace :ruby_sim do



  def start_ruby_server

    port = KineticRuby::DEFAULT_KINETIC_PORT

    # port = KineticRuby::TEST_KINETIC_PORT

    $kinetic_server ||= KineticRuby::Server.new(port)

    $kinetic_server.start

  end



  def shutdown_ruby_server

    $kinetic_server.shutdown unless $kinetic_server.nil?

    $kinetic_server = nil

  end



  task :start do

    start_ruby_server

  end



  task :shutdown do

    shutdown_ruby_server

  end

end



task 'test/integration/test_kinetic_socket.c' => ['ruby_sim:start']



desc "Run client test utility"

task :run do
@@ -207,11 +230,10 @@ task :test_all do 
  Rake::Task['test:path'].invoke('test/unit')



  report_banner "Running Integration Tests"

  start_ruby_server

  Rake::Task['test:path'].reenable

  Rake::Task['test:path'].invoke('test/integration')



  Rake::Task['server:shutdown'].reenable

  Rake::Task['server:shutdown'].invoke

  shutdown_ruby_server



  report_banner "Running System Tests"

  java_sim_start

project.yml

+0 −6
Original line number Diff line number Diff line
@@ -71,12 +71,6 @@ 
    bool_t:     BOOL



:tools:

  # :test_dependencies_generator:

  #   :arguments:

  #     - "-:-MD"

  # :release_dependencies_generator:

  #   :arguments:

  #     - "-:-MD"

  :test_includes_preprocessor:

    :executable: gcc

    :arguments:

src/lib/kinetic_exchange.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ typedef struct _KineticExchange 
    // client and the device, used to sign requests.

    bool has_key;

    size_t keyLength;

    char key[KINETIC_MAX_KEY_LEN];

    char key[KINETIC_MAX_KEY_LEN+1];



    // Required field

    // A unique number for this connection between the source and target.

src/lib/kinetic_logger.c

+15 −0
Original line number Diff line number Diff line
@@ -55,3 +55,18 @@ void KineticLogger_Log(const char* message) 
        fclose(fd);

    }

}



int KineticLogger_LogPrintf(const char* format, ...)

{

   va_list arg_ptr;

   char buffer[1024];

   int result;



   va_start(arg_ptr, format);

   result = vsprintf(buffer, format, arg_ptr);

   va_end(arg_ptr);



   KineticLogger_Log(buffer);



   return(result);

}