mirror of
https://github.com/openvswitch/ovs
synced 2025-08-22 09:58:01 +00:00
9854d473ad
After profiling OVSDB insert performance it was found that some significant portion of its time OVSDB is calling the function json_clone. Also, the current usages of json_clone never modify the json, just keeps it to prevent it to be freed. With that in mind the struct json, json_create, json_clone and json_destroy were modified to keep a count of how many references of the json struct are left. Only when that count reaches zero the json struct is freed. The old "json_clone" function was renamed as "json_deep_clone". Some examples of the performance difference: In these tests a test table with 4 columns (string, string, bool, integer) was used. All the tests used "commit block". *** 50 process each inserting 1000 rows *** Master OVS Test Duration 131 seconds Average Inserts Per second 746.2687 inserts/s Average Insert Duration 134.1382 ms Minimal Insert Duration 0.166202 ms Maximum Insert Duration 489.8593 ms JSON GC Patch Test Duration 86 seconds Average Inserts Per second 1176 inserts/s Average Insert Duration 82.26761 ms Minimal Insert Duration 0.165448 ms Maximum Insert Duration 751.2111 ms *** 5 process each inserting 10000 rows *** Master OVS Test Duration 8 seconds Average Inserts Per second 7142.857 inserts/s Average Insert Duration 0.656431 ms Minimal Insert Duration 0.125197 ms Maximum Insert Duration 11.93203 ms JSON GC Patch Test Duration 7 seconds Average Inserts Per second 8333.333 inserts/s Average Insert Duration 0.55688 ms Minimal Insert Duration 0.143233 ms Maximum Insert Duration 26.26319 ms Signed-off-by: Esteban Rodriguez Betancourt <estebarb@hpe.com> Signed-off-by: Ben Pfaff <blp@ovn.org>
144 lines
4.4 KiB
C
144 lines
4.4 KiB
C
/*
|
||
* Copyright (c) 2009, 2010, 2015 Nicira, Inc.
|
||
*
|
||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||
* you may not use this file except in compliance with the License.
|
||
* You may obtain a copy of the License at:
|
||
*
|
||
* http://www.apache.org/licenses/LICENSE-2.0
|
||
*
|
||
* Unless required by applicable law or agreed to in writing, software
|
||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||
* See the License for the specific language governing permissions and
|
||
* limitations under the License.
|
||
*/
|
||
|
||
#ifndef JSON_H
|
||
#define JSON_H 1
|
||
|
||
/* This is an implementation of JavaScript Object Notation (JSON) as specified
|
||
* by RFC 4627. It is intended to fully comply with RFC 4627, with the
|
||
* following known exceptions and clarifications:
|
||
*
|
||
* - Null bytes (\u0000) are not allowed in strings.
|
||
*
|
||
* - Only UTF-8 encoding is supported (RFC 4627 allows for other Unicode
|
||
* encodings).
|
||
*
|
||
* - Names within an object must be unique (RFC 4627 says that they
|
||
* "should" be unique).
|
||
*/
|
||
|
||
#include <stdio.h>
|
||
#include "openvswitch/shash.h"
|
||
|
||
#ifdef __cplusplus
|
||
extern "C" {
|
||
#endif
|
||
|
||
struct ds;
|
||
|
||
/* Type of a JSON value. */
|
||
enum json_type {
|
||
JSON_NULL, /* null */
|
||
JSON_FALSE, /* false */
|
||
JSON_TRUE, /* true */
|
||
JSON_OBJECT, /* {"a": b, "c": d, ...} */
|
||
JSON_ARRAY, /* [1, 2, 3, ...] */
|
||
JSON_INTEGER, /* 123. */
|
||
JSON_REAL, /* 123.456. */
|
||
JSON_STRING, /* "..." */
|
||
JSON_N_TYPES
|
||
};
|
||
|
||
const char *json_type_to_string(enum json_type);
|
||
|
||
/* A JSON array. */
|
||
struct json_array {
|
||
size_t n, n_allocated;
|
||
struct json **elems;
|
||
};
|
||
|
||
/* A JSON value. */
|
||
struct json {
|
||
enum json_type type;
|
||
size_t count;
|
||
union {
|
||
struct shash *object; /* Contains "struct json *"s. */
|
||
struct json_array array;
|
||
long long int integer;
|
||
double real;
|
||
char *string;
|
||
} u;
|
||
};
|
||
|
||
struct json *json_null_create(void);
|
||
struct json *json_boolean_create(bool);
|
||
struct json *json_string_create(const char *);
|
||
struct json *json_string_create_nocopy(char *);
|
||
struct json *json_integer_create(long long int);
|
||
struct json *json_real_create(double);
|
||
|
||
struct json *json_array_create_empty(void);
|
||
void json_array_add(struct json *, struct json *element);
|
||
void json_array_trim(struct json *);
|
||
struct json *json_array_create(struct json **, size_t n);
|
||
struct json *json_array_create_1(struct json *);
|
||
struct json *json_array_create_2(struct json *, struct json *);
|
||
struct json *json_array_create_3(struct json *, struct json *, struct json *);
|
||
|
||
struct json *json_object_create(void);
|
||
void json_object_put(struct json *, const char *name, struct json *value);
|
||
void json_object_put_string(struct json *,
|
||
const char *name, const char *value);
|
||
|
||
const char *json_string(const struct json *);
|
||
struct json_array *json_array(const struct json *);
|
||
struct shash *json_object(const struct json *);
|
||
bool json_boolean(const struct json *);
|
||
double json_real(const struct json *);
|
||
int64_t json_integer(const struct json *);
|
||
|
||
struct json *json_deep_clone(const struct json *);
|
||
struct json *json_clone(const struct json *);
|
||
void json_destroy(struct json *);
|
||
|
||
size_t json_hash(const struct json *, size_t basis);
|
||
bool json_equal(const struct json *, const struct json *);
|
||
|
||
/* Parsing JSON. */
|
||
enum {
|
||
JSPF_TRAILER = 1 << 0 /* Check for garbage following input. */
|
||
};
|
||
|
||
struct json_parser *json_parser_create(int flags);
|
||
size_t json_parser_feed(struct json_parser *, const char *, size_t);
|
||
bool json_parser_is_done(const struct json_parser *);
|
||
struct json *json_parser_finish(struct json_parser *);
|
||
void json_parser_abort(struct json_parser *);
|
||
|
||
struct json *json_from_string(const char *string);
|
||
struct json *json_from_file(const char *file_name);
|
||
struct json *json_from_stream(FILE *stream);
|
||
|
||
/* Serializing JSON. */
|
||
|
||
enum {
|
||
JSSF_PRETTY = 1 << 0, /* Multiple lines with indentation, if true. */
|
||
JSSF_SORT = 1 << 1 /* Object members in sorted order, if true. */
|
||
};
|
||
char *json_to_string(const struct json *, int flags);
|
||
void json_to_ds(const struct json *, int flags, struct ds *);
|
||
|
||
/* JSON string formatting operations. */
|
||
|
||
bool json_string_unescape(const char *in, size_t in_len, char **outp);
|
||
void json_string_escape(const char *in, struct ds *out);
|
||
|
||
#ifdef __cplusplus
|
||
}
|
||
#endif
|
||
|
||
#endif /* json.h */
|