add CMake support by danewalton-msft · Pull Request #201 · intel/tinycbor

danewalton-msft · 2021-02-09T22:02:19Z

Added some basic CMake support to the library to make it easier to integrate with other projects. Also added a few bits to README's so let me know if those tweaks are out of scope.

Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

This reverts commit 6587c3e. Bringing the API back in 0.6, but it'll change before the release. Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

We don't need to compare the map lengths directly. The memcmp is sufficient, since the source data is big endian. Of course, verifying for sorting requires the map has known length. Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

Because of all the inline functions, #include'ing <cbor.h> without linking in all .c files may result in undefined symbol linker errors. Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

…nt data as single float Motivation: half-precision floating point format is used to minimize storage and traffic mostly. Application level manipulates with single and double precision usually. So, two routines added to public API to encode/decode given single precision value in the half precision format Signed-off-by: S.Phirsov Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

QCOMPARE macro has a return in case of failure. If a test fails inside the encodeOne function, we log that error, but were proceeding to perform more tests (which could fail again and produce more errors). Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

backup-isaac · 2021-06-02T19:51:15Z

Since open_memstream doesn't have a Windows implementation, CMake shouldn't try to build it on Windows. I am not the most proficient at CMake so there might be a more idiomatic way to do this, but something like the following should match the behavior of the original Makefiles:

set(tinycbor_SOURCES)
list(
    APPEND tinycbor_SOURCES
    ${CMAKE_CURRENT_LIST_DIR}/src/cborencoder.c
    ${CMAKE_CURRENT_LIST_DIR}/src/cborencoder_close_container_checked.c
    ${CMAKE_CURRENT_LIST_DIR}/src/cborerrorstrings.c
    ${CMAKE_CURRENT_LIST_DIR}/src/cborparser.c
    ${CMAKE_CURRENT_LIST_DIR}/src/cborparser_dup_string.c
    ${CMAKE_CURRENT_LIST_DIR}/src/cborpretty.c
    ${CMAKE_CURRENT_LIST_DIR}/src/cborpretty_stdio.c
    ${CMAKE_CURRENT_LIST_DIR}/src/cbortojson.c
    ${CMAKE_CURRENT_LIST_DIR}/src/cborvalidation.c
)

if("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
    add_definitions(-DWITHOUT_OPEN_MEMSTREAM)
    message(
        WARNING
        "funopen and fopencookie unavailable, open_memstream can not be implemented and conversion to JSON will not work properly!"
    )
else()
    list(APPEND tinycbor_SOURCES ${CMAKE_CURRENT_LIST_DIR}/src/open_memstream.c)
endif()

backup-isaac · 2021-06-22T22:06:17Z

Since open_memstream doesn't have a Windows implementation ...

I made this change in another fork: https://github.com/backup-isaac/tinycbor/tree/cmake-windows

Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

…nt data as single float Motivation: half-precision floating point format is used to minimize storage and traffic mostly. Application level manipulates with single and double precision usually. So, two routines added to public API to encode/decode given single precision value in the half precision format Signed-off-by: S.Phirsov Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

The listing was outdated. Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

The last version of Qt to support MSVC 2015 is no longer maintained, so I'm skipping that. I'm therefore rededicating MSVC 2017 for 32-bit. There's also no more no-tests build.

We don't need to compare the map lengths directly. The memcmp is sufficient, since the source data is big endian. Of course, verifying for sorting requires the map has known length. Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

Because of all the inline functions, #include'ing <cbor.h> without linking in all .c files may result in undefined symbol linker errors. Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

QCOMPARE macro has a return in case of failure. If a test fails inside the encodeOne function, we log that error, but were proceeding to perform more tests (which could fail again and produce more errors). Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

As noted in the comment, we need to be sure we don't allow a length too big from the stream to overflow and become smaller than the number of bytes we're looking for. This is also the first step in creating an API that reads from something other than a linear buffer. Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

This commit does not change all the readers yet, this is just the first step. As an interesting side-effect, we ended up reading the half-float into it->extra and need not re-read it. The cbor_value_get_half_float() function can be inlined in a later commit. Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

We don't need to skimp on bits in the CborValue::flags, so save the fact that the preparser found a 64-bit number in there. This saves us from having to re-read the descriptor byte again in _cbor_value_decode_int64_internal(). Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

It was originally non-inline because I had thought of doing conversions from half-float to float and onwards to double, but I never actually made that in the API. Instead, even the get_float() and get_double(), we only memcpy anyway and leave it up to the upper layer to convert, as needed. This change triggered an use-when-uninitialised false positive warning that I needed to work around in the validator. Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

The extract_length() function is only used in string context, so rename accordingly. Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

The extract_length() was the only case that called extract_number_and_advance() without verifying we had a proper number. This commit reworks the implementation so extract_number_and_advance() reuses the number previously read by preparse_value(), and extract_length() gets inlined to the only place that uses it. Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

Instead of consuming it at the end of the last element of a map or array of unknown length. This allows us to obtain the pointer to or offset of the Break byte. Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

We need to re-parse if the input buffer was too short to read the current element's information. When that happens, the current element will be CborInvalidType, so we can't easily resume. Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

Instead of just one function (_cbor_value_get_string_chunk), we now have _cbor_value_begin_string_iteration, _cbor_value_finish_string_iteration, _cbor_value_get_string_chunk_size, and _cbor_value_get_string_chunk. The "begin" function positions the pointer at the first chunk. That's what makes "get_size" possible, since it doesn't need to check for any state. The "finish" funcntion allows the caller to distinguish an error parsing the string from an error parsing the next value. Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

Signed-off-by: Dmitry Shachnev <mitya57@gmail.com>

CMakeLists.txt

thiagomacieira · 2021-09-03T20:36:28Z

CMakeLists.txt

+
+option(build_tools "Build the cbor tools. Note: This will install the cjson library as a dependency" OFF)
+
+add_library(tinycbor


File listing has changed.

I think all the .c files should be there.

There are new files in the 0.6 release. That's what needs updating here.

examples/testcbor

danewalton-msft · 2021-09-22T16:52:39Z

closing in favor of #209 to point to main

thiagomacieira and others added 16 commits January 30, 2018 15:04

Update version number for TinyCBOR 0.6

4509c99

Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

One more place to update the version number in

3c4c103

Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

Revert "Parser: remove the cbor_value_get_xxxx_string_chunk() API"

edd2b9e

This reverts commit 6587c3e. Bringing the API back in 0.6, but it'll change before the release. Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

Merge branch 'master' into dev

c3c0f7e

Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

Merge branch 'master' into dev

573e5a4

Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

Merge remote-tracking branch 'origin/master' into dev

666beac

Merge branch 'master' into dev

4e50bef

Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

Add a way to disable the declaration of some API

aa37315

Because of all the inline functions, #include'ing <cbor.h> without linking in all .c files may result in undefined symbol linker errors. Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

Merge branch 'master' into dev

dd2fa30

Merge branch 'master' into 'dev'

b0840db

Merge branch 'master' into dev

6643c17

Merge remote-tracking branch 'origin/master' into dev

9a13e92

Merge branch 'master' into dev

7dce551

thiagomacieira and others added 12 commits September 3, 2021 11:48

Update references of 'master' to 'main'

dbf8f13

Update version number for TinyCBOR 0.6

cb37252

Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

Update the qmake buildsystem source files

9ed9d03

The listing was outdated. Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

Merge remote-tracking branch 'origin/main' into HEAD

5910b7d

Build system: Add a few -Werror for sane C development

e2a4ed1

AppVeyor: update to use more recent Qt and MSVC

bf919a2

The last version of Qt to support MSVC 2015 is no longer maintained, so I'm skipping that. I'm therefore rededicating MSVC 2017 for 32-bit. There's also no more no-tests build.

Add a way to disable the declaration of some API

6f001e6

Because of all the inline functions, #include'ing <cbor.h> without linking in all .c files may result in undefined symbol linker errors. Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

thiagomacieira and others added 14 commits September 3, 2021 13:08

Parser: use read_bytes() in the extract_number function

a8515c4

The extract_length() function is only used in string context, so rename accordingly. Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

Validator & Pretty: Remove the last uses of _cbor_value_extract_number

5d871b2

Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

Pretty & Validation: remove the last direct accesses to CborValue::ptr

d503c11

Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

Parser: let cbor_value_leave_container() consume the Break

95129b8

Instead of consuming it at the end of the last element of a map or array of unknown length. This allows us to obtain the pointer to or offset of the Break byte. Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

WIP Initial API for delegated streaming in

34c8452

Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

WIP Initial API for delegated streaming out

e26ff9a

Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

Move the testdata out to a separate .cpp so they can be reused

87a7a93

Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

Parser: fix reading it->extra on big endian when bytesNeeded == 1

d393c16

Signed-off-by: Dmitry Shachnev <mitya57@gmail.com>

.gitignore: ignore the c90 test too

10f7399

thiagomacieira requested changes Sep 3, 2021

View reviewed changes

danewalton-msft added 3 commits September 22, 2021 09:50

add CMake support

c223ee6

update to evaluate lib finding at compile time

b422a41

remove test cbor

9ded7dc

danewalton-msft force-pushed the cmake branch from 5cac61d to 9ded7dc Compare September 22, 2021 16:51

danewalton-msft closed this Sep 22, 2021

thiagomacieira mentioned this pull request Apr 28, 2023

Added possibility to include external config file. #234

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add CMake support#201

add CMake support#201
danewalton-msft wants to merge 45 commits intointel:masterfrom
danewalton-msft:cmake

danewalton-msft commented Feb 9, 2021 •

edited

Loading

Uh oh!

backup-isaac commented Jun 2, 2021

Uh oh!

backup-isaac commented Jun 22, 2021

Uh oh!

Uh oh!

thiagomacieira Sep 3, 2021

Uh oh!

danewalton-msft Sep 22, 2021

Uh oh!

thiagomacieira Sep 22, 2021

Uh oh!

Uh oh!

danewalton-msft commented Sep 22, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants


		option(build_tools "Build the cbor tools. Note: This will install the cjson library as a dependency" OFF)

		add_library(tinycbor

Conversation

danewalton-msft commented Feb 9, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

backup-isaac commented Jun 2, 2021

Uh oh!

backup-isaac commented Jun 22, 2021

Uh oh!

Uh oh!

thiagomacieira Sep 3, 2021

Choose a reason for hiding this comment

Uh oh!

danewalton-msft Sep 22, 2021

Choose a reason for hiding this comment

Uh oh!

thiagomacieira Sep 22, 2021

Choose a reason for hiding this comment

Uh oh!

Uh oh!

danewalton-msft commented Sep 22, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

danewalton-msft commented Feb 9, 2021 •

edited

Loading