Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Config subsys v4 #1516

Merged
merged 19 commits into from Nov 7, 2019
Merged

Config subsys v4 #1516

merged 19 commits into from Nov 7, 2019

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@nmathewson @coveralls @torproject-pusher
@nmathewson
Copy link
Contributor

@nmathewson nmathewson commented Nov 7, 2019

No description provided.

nmathewson added 19 commits Nov 7, 2019
@nmathewson
lib/cc: Define the standard C macro pasting trick in one place.
4541a59 
This file is a workaround for the issue that if you say `a ## b` to
create a token that is the name of a macro, the C preprocessor won't
expand that macro.  So you can't say this:

#define FOO__SQUARE(x) ((x)*(x))
#define FOO__CUBE(x)   ((x)*(x)*(x))
#define FOO(func, x)   FOO__##func(x)

Instead, the standard C trick is to add a layer of indirection:

#define PASTE(a,b)     PASTE__(a,b)
#define PASTE__(a,b)   a ## b

#define FOO__SQUARE(x) ((x)*(x))
#define FOO__CUBE(x)   ((x)*(x)*(x))
#define FOO(func, x)   PASTE(FOO__, func)(x)

We should use this kind of trick sparingly, since it gets confusing.
@nmathewson
Macros for declaring configuration structs and variable-tables
19cac40 
In our old design, we had to declare configuration structures (like
or_options_t) and variable tables (like option_vars_) separately,
and we used some magic to enforce their consistency (see
conftesting.h).

With this design, we write a single definition for the configuration
object and its fields, and use C macros to expand it either into a
structure, or a variable table.  Since they are both made from the
same source, they can't become inconsistent.

The two designs can coexist happily, and we can migrate from one to
the other at our convenience.
@nmathewson
Add FOO_type_defn globals so that confdecl.h can refer to them.
683d4c2
@nmathewson
Define a low-level version of the confdecl table macros
1d10889 
This version uses the enum rather than the type definitions, to
avoid layering violations and linking problems.
@nmathewson
Teach doxygen about option-declaration code.
5914add 
These settings allow doxygen to find and understand doxygen comments
in configuration definitions made using the macros in confdecl.h.
@nmathewson
Expose get_obj() functions from confmgt.c.
8638989 
The subsysmgr code wants to use them.
@nmathewson
Make a new structure for tracking subsystem status.
a7cfddc 
We used to have only one boolean per subsystem, but we're about to
have a little more information.
@nmathewson
Give subsystems optional config formats and state formats.
7ac4f9d 
The formats, when provided, are now added to the global config_mgr_t
objects.
@nmathewson
Add subsys functions for receiving/flushing states and options.
52c0ab4 
These functions are in the subsystem, not in the config_format_t,
since they are about how the format is _used_, not about _what it
is_.
@nmathewson
Add testing-only functions to get the subsystem config/state indices
b06e9d8
@nmathewson
Use new configuration architecture for crypto options
8cd3e66 
This is a comparatively simple change.
@nmathewson
crypto config: do not change the user's value of HardwareAccel.
0d8504e 
We still interpret "AccelName" as turning on the "HardwareAccel"
feature, but we no longer modify the user's options here.

Fixes bug 32382; bugfix on 0.2.2.1-alpha when we added openssl
engine support.
@nmathewson
Stop using "config_suite_offset=-1" to indicate "no config suite."
0f0a9bd 
Instead, create a separate "has_config_suite" boolean, so that only
top-level formats with config_suites need to declare an offset at
all.
@nmathewson
subsysmgr: use IDX_NONE is an exception value, not -1.
3afbb29
@nmathewson
Move netstatus (mainloop) state fields into mainloop's state.
280a9a4
@nmathewson
conf_examples test for crypto_accel
27a4438
@nmathewson
Add the ability to fail when a hardware accelerator is missing.
32a2f96 
Closes ticket 32406.
@nmathewson
Add a test for 32406 (AccelName with "!").
c550990 
This also lets us test a failing set_options().
@nmathewson
Adjustments to 32406 per review
de7053b 
When we are failing because of a lack of a _required_ engine, note
that the engine was "required".

When engines are disabled, any required engine should cause a
failure.
@coveralls
Copy link

@coveralls coveralls commented Nov 7, 2019

Pull Request Test Coverage Report for Build 7134

  • 120 of 126 (95.24%) changed or added relevant lines in 9 files are covered.
  • 1 unchanged line in 1 file lost coverage.
  • Overall coverage increased (+0.06%) to 62.424%
Changes Missing Coverage Covered Lines Changed/Added Lines %
src/app/config/statefile.c 4 5 80.0%
src/app/main/subsysmgr.c 73 78 93.59%
Files with Coverage Reduction New Missed Lines %
src/feature/hs/hs_common.c 1 84.27%
Totals Coverage Status
Change from base Build 7133: 0.06%
Covered Lines: 48710
Relevant Lines: 78031
💛 - Coveralls

@torproject-pusher torproject-pusher merged commit de7053b into torproject:master Nov 7, 2019
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment