Code

Feature/160 fmuproxy integration#162

Code

Merged

markaren merged 83 commits intomasteropen-simulation-platform/libcosim:masterfrom feature/160-fmuproxy-integrationopen-simulation-platform/libcosim:feature/160-fmuproxy-integrationCopy head branch name to clipboardApr 29, 2019

+19,984-3

Commits

Commits on Jan 29, 2019

• Add thrift and explicit openssl dependency

  

  Lars Ivar Hatledal

  committed
  79c4384

• Add find_package(Thrift)

  

  Lars Ivar Hatledal

  committed
  738ebfe

• Add auto-generated thrift classes

  

  Lars Ivar Hatledal

  committed
  df4c839

Commits on Jan 30, 2019

• Basic fmu-proxy implementation in place

  Show description for 1909809
  

  Lars Ivar Hatledal

  committed
  1909809

• Merge remote-tracking branch 'origin/master' into feature/160-fmuproxy-integration

  

  Lars Ivar Hatledal

  committed
  71be466

• Fix warning about NOMINMAX macro redefinition

  

  Lars Ivar Hatledal

  committed
  7d9739c

• Remember to open transport!

  

  Lars Ivar Hatledal

  committed
  f213e03

• Add fmuproxy_test

  

  Lars Ivar Hatledal

  committed
  1dc70b5

• Update fmuproxy_test

  

  Lars Ivar Hatledal

  committed
  e01fab7

• Make fmuproxy integration optional

  

  Lars Ivar Hatledal

  committed
  3c0d50f

• Cleanup

  

  Lars Ivar Hatledal

  committed
  cd0cd19

• Add error handling

  

  Lars Ivar Hatledal

  committed
  7b064b5

• Implement get and set variables

  

  Lars Ivar Hatledal

  committed
  f423673

• Update fmuproxy_test

  

  Lars Ivar Hatledal

  committed
  f855566

Commits on Jan 31, 2019

• Fix getType not always returning the correct type

  

  Lars Ivar Hatledal

  committed
  76de2da

• Merge remote-tracking branch 'origin/master' into feature/160-fmuproxy-integration

  

  Lars Ivar Hatledal

  committed
  e931387

Commits on Feb 1, 2019

• Add missing fmuproxy headers

  

  Lars Ivar Hatledal

  committed
  5dce31e

Commits on Feb 5, 2019

• Fix compile under gcc

  markaren

  committed
  c1b87a7

• Update test

  markaren

  committed
  a911b17

Commits on Feb 6, 2019

• Add concurrency support and misc refactor

  

  Lars Ivar Hatledal

  committed
  22cbed2

• Make using the concurrent client optional

  

  Lars Ivar Hatledal

  committed
  c9fd2c0

• Add sanity checks. See #166

  

  Lars Ivar Hatledal

  committed
  fbfafc1

• Update fmuproxy_test

  

  Lars Ivar Hatledal

  committed
  23f4762

• Add conan remote for thrift

  

  Lars Ivar Hatledal

  committed
  ea14b57

• Suppress warning C4245

  

  Lars Ivar Hatledal

  committed
  b1173dd

• Only include thread test on Windows and use program arguments

  

  Lars Ivar Hatledal

  committed
  44e57c9

• Add conan remote also for linux build

  

  Lars Ivar Hatledal

  committed
  df18633

Commits on Feb 7, 2019

• Update FindThrift

  markaren

  committed
  99e5ad7

• Fix slaves not being terminated using execution API

  markaren

  committed
  abe6064

• Merge branch 'feature/160-fmuproxy-integration' of github.com:open-simulation-platform/cse-core into feature/160-fmuproxy-integration

  markaren

  committed
  98ed327

• Merge remote-tracking branch 'origin/master' into feature/160-fmuproxy-integration

  markaren

  committed
  214b16e

• Let the destructor call terminate on slave instance

  markaren

  committed
  72b800b

• Try fix jenkins error

  markaren

  committed
  a93d4a5

• Try fix jenkins error attempt 2

  markaren

  committed
  22348d2

Commits on Feb 8, 2019

• explicitly set terminated_ to false

  markaren

  committed
  d29dcd0

• Link pthread on linux

  markaren

  committed
  86218a4

• Using chrono to measure time

  markaren

  committed
  b06ae5b

• Fix MSCV warning about shadowing and cleanup

  markaren

  committed
  50934c6

• Fix wrong header search path

  markaren

  committed
  e6d0521

• Add missing guard

  markaren

  committed
  c6a6708

• Fix serial test reusing (and incrementing!) startTime

  markaren

  committed
  a9d54f8

Commits on Feb 9, 2019

• Cleanup fmuproxy_test

  markaren

  committed
  523c107

Commits on Feb 11, 2019

• implement client-side load(url)

  markaren

  committed
  a1fde04

• remove unused header

  markaren

  committed
  6943a39

• Merge remote-tracking branch 'origin/master' into feature/160-fmuproxy-integration

  Show description for 57a179e
  markaren

  committed
  57a179e

• fix merge with master

  markaren

  committed
  7e26b50

• remove unnecessary linking

  markaren

  committed
  a20d82d

• use make_background_slave

  markaren

  committed
  0d67ace

• switch to binary protocol (from compact)

  Show description for 3e9e020
  markaren

  committed
  3e9e020

• Only supress C4245 with fmuproxy and supress C4706 as well

  markaren

  committed
  f272f95

• Fix unused parameter warning and apply clang-tidy suggestions

  markaren

  committed
  97b1d65

• Remove -DNOMINMAX definitions

  markaren

  committed
  33e836a

• Fix redefinition warning for NOMINMAX macro

  markaren

  committed
  d497ce5

• Make sure header guards are and will be unique in the future

  markaren

  committed
  16f3257

• Refactor

  markaren

  committed
  46d2ea4

Commits on Feb 12, 2019

• Improve header guards

  markaren

  committed
  d6cf5c1

• Refactor

  markaren

  committed
  625809a

• make sure slaves are terminated

  markaren

  committed
  88c1944

• make sure test setups are comparable

  markaren

  committed
  003ecbe

• Fix recursive call

  markaren

  committed
  4b6102a

• Fix winsock issue on windows

  markaren

  committed
  47a76a2

• Load test fmu from URL

  markaren

  committed
  20744ac

• Fix serial test appending time

  markaren

  committed
  06ca685

Commits on Feb 20, 2019

• Merge remote-tracking branch 'origin/master' into feature/160-fmuproxy-integration

  Show description for 6dee55c
  markaren

  committed
  6dee55c

Commits on Feb 21, 2019

• Make fmuproxy a conan option

  markaren

  committed
  0a36f63

Commits on Feb 27, 2019

• Merge remote-tracking branch 'origin/master' into feature/160-fmuproxy-integration

  Show description for 3212314
  

  Lars Ivar Hatledal

  committed
  3212314

• Update auto-generated thrift files

  

  Lars Ivar Hatledal

  committed
  35436a3

• Update auto-generated thrift files

  

  Lars Ivar Hatledal

  committed
  7f1bb2f

• Update thrift helper

  

  Lars Ivar Hatledal

  committed
  8e3724a

• Fix step no longer takes any arguments

  

  Lars Ivar Hatledal

  committed
  2b97735

Commits on Mar 2, 2019

• Merge remote-tracking branch 'origin/master' into feature/160-fmuproxy-integration

  

  Lars Ivar Hatledal

  committed
  daf2762

• Update thrift generated files, and implement from_file

  

  Lars Ivar Hatledal

  committed
  08e5831

Commits on Mar 20, 2019

• Formatted with ClangFormat. Skipped @generated files.

  

  Halvor Platou

  committed
  f170655

• empty string -> default value and snake_case

  markaren

  committed
  be462e2

• snake_case and fix -werror unused variable

  markaren

  committed
  8f389ea

Commits on Mar 25, 2019

• Merge branch 'master' into feature/160-fmuproxy-integration

  markaren

  committed
  50ea538

• snake_case

  markaren

  committed
  4be103f

• fix indentation

  markaren

  committed
  2ab7c15

• Build fmuproxy with jenkins

  Show description for ac37b29
  markaren

  committed
  ac37b29

Commits on Apr 22, 2019

• Merge remote-tracking branch 'origin/master' into feature/160-fmuproxy-integration

  Show description for 90a3c04
  markaren

  committed
  90a3c04

• find thrift debug library

  markaren

  committed
  adbff55

• update thrift generated sources

  markaren

  committed
  459d0e5

Commits on Apr 24, 2019

• Must use different build folder because of parallel builds

  

  Halvor Platou

  committed
  da4818e