Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
b0435f8
Initial commit of changes to simplify creation of shared library
maxgolov Jan 8, 2020
60417e4
Add netcore30 wrapper example on top of shared lib
maxgolov Jan 8, 2020
cc85d1e
Clean-up the wrapper a little bit
maxgolov Jan 8, 2020
a1f032c
Merge branch 'master' into maxgolov/shared_library
maxgolov Jan 9, 2020
aa2e529
Add more APIs to netcore implementation
maxgolov Jan 18, 2020
bbbfcdf
Merge branch 'master' into maxgolov/shared_library
maxgolov Jan 18, 2020
30f7782
Working implementation of C# .NET Core 3.1 wrapper on top of C API (t…
maxgolov Jan 19, 2020
58a7344
Add some support for GUID type (not the final impl)
maxgolov Jan 19, 2020
9794a82
Merge branch 'master' into maxgolov/shared_library
maxgolov Mar 31, 2020
39022cf
Merge branch 'master' of https://github.com/microsoft/cpp_client_tele…
maxgolov Apr 12, 2020
824e827
Merge branch 'maxgolov/shared_library' of https://github.com/microsof…
maxgolov Apr 12, 2020
8d46e3c
Merge branch 'master' into maxgolov/shared_library
maxgolov Apr 16, 2020
f009ff4
Merge branch 'master' into maxgolov/shared_library
maxgolov May 2, 2020
7c17781
Merge branch 'master' into maxgolov/shared_library
maxgolov May 21, 2020
f30add6
Merge branch 'master' of https://github.com/microsoft/cpp_client_tele…
maxgolov Sep 25, 2020
ba4763c
Merge branch 'master' of https://github.com/microsoft/cpp_client_tele…
maxgolov Sep 25, 2020
eeb5129
Verify that the .NET Core wrapper sample works on Windows
maxgolov Sep 25, 2020
a1e43a6
Merge branch 'master' into maxgolov/shared_library
maxgolov Sep 25, 2020
63f787e
Merge branch 'master' into maxgolov/shared_library
maxgolov Sep 27, 2020
0980fcd
Merge branch 'master' into maxgolov/shared_library
maxgolov Oct 2, 2020
4f256f1
Merge branch 'master' into maxgolov/shared_library
maxgolov Oct 6, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 27 additions & 7 deletions lib/include/public/mat.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,28 @@
* For version handshake check there is no mandatory requirement to update the $PATCH level.
* Ref. https://semver.org/ for Semantic Versioning documentation.
*/
#define TELEMETRY_EVENTS_VERSION "3.1.0"
#define TELEMETRY_EVENTS_VERSION "3.4.0"

#include "ctmacros.hpp"

#ifdef _WIN32
#include <Windows.h>
#endif

#ifdef __clang__
#define PACKED_STRUCT __attribute__((packed))
#define PACK_PUSH
#define PACK_POP
#elif __GNUC__
#define PACKED_STRUCT __attribute__((packed))
#define PACK_PUSH
#define PACK_POP
#else
#define PACKED_STRUCT
#define PACK_PUSH __pragma(pack(push, 1))
#define PACK_POP __pragma(pack(pop))
#endif

#if (_MSC_VER == 1500) || (_MSC_VER == 1600)
/* Visual Studio 2010 */
typedef __int64 int64_t;
Expand Down Expand Up @@ -56,7 +70,7 @@ typedef int bool;
extern "C" {
#endif

typedef enum
typedef enum /* 32-bit */
{
EVT_OP_LOAD = 0x00000001,
EVT_OP_UNLOAD = 0x00000002,
Expand All @@ -70,10 +84,11 @@ extern "C" {
EVT_OP_FLUSH = 0x0000000A,
EVT_OP_VERSION = 0x0000000B,
EVT_OP_OPEN_WITH_PARAMS = 0x0000000C,
EVT_OP_MAX = EVT_OP_OPEN_WITH_PARAMS + 1
EVT_OP_MAX = EVT_OP_OPEN_WITH_PARAMS + 1,
EVT_OP_MAXINT = 0xFFFFFFFF
} evt_call_t;

typedef enum
typedef enum /* 32-bit */
{
/* Basic types */
TYPE_STRING,
Expand All @@ -90,7 +105,8 @@ extern "C" {
TYPE_BOOL_ARRAY,
TYPE_GUID_ARRAY,
/* NULL-type */
TYPE_NULL
TYPE_NULL,
TYPE_MAXINT = 0xFFFFFFFF
} evt_prop_t;

typedef struct
Expand Down Expand Up @@ -128,13 +144,15 @@ extern "C" {
typedef int32_t evt_status_t;
typedef struct evt_event evt_event;

typedef struct
typedef struct PACKED_STRUCT
{
PACK_PUSH
evt_call_t call; /* In */
evt_handle_t handle; /* In / Out */
void* data; /* In / Out */
evt_status_t result; /* Out */
uint32_t size; /* In / Out */
PACK_POP
} evt_context_t;

/**
Expand Down Expand Up @@ -194,12 +212,14 @@ extern "C" {
uint64_t** as_arr_time;
} evt_prop_v;

typedef struct
typedef struct PACKED_STRUCT
{
PACK_PUSH
const char* name;
evt_prop_t type;
evt_prop_v value;
uint32_t piiKind;
PACK_POP
} evt_prop;

/**
Expand Down
2 changes: 1 addition & 1 deletion tools/vcpkg
Submodule vcpkg updated 148 files
Loading