When moving this code to C++ in an upcoming commit, this would otherwise
trigger:
lib/mingle/ink.cpp:46:22: error: uninitialized const 'Origin' [-fpermissive]
static const point_t Origin;
^
In file included from lib/mingle/ink.cpp:17:0:
lib/mingle/ink.h:19:16: note: 'const struct point_t' has no user-provided
default constructor
typedef struct {
^
lib/mingle/ink.h:20:10: note: and the implicitly-defined constructor does not
initialize 'double point_t::x'
double x, y;
^
This noisy initialization can probably be undone after mingle and libmingle are
moved to entirely C++.
Code in routespl.c used a long-lived buffer, `ps`, that it resized to deal with
various operations. This made the code thread-unsafe, and note that there are
also various work arounds in routespl.c to deal with re-entrancy which is
complicated by this design.
This commit rephrases `simpleSplineRoute` and `_routesplines` to dynamically
allocate a fresh buffer for each operation. The ergonomics cost of this is that
callers of `simpleSplineRoute`, `routesplines`, and `routepolylines` now need to
eventually free the returned pointer. This is unfortunately fairly noisy to deal
with in C and would have been cleaner in C++.
In future, this direction should probably be taken further to allow
`routesplinesinit` and `routesplinesterm` to be removed. This design that relies
on static globals is incompatible with multi-threading, so if Graphviz ever
wants to support multi-threading, this will need to be removed.
Note that this commit introduce two new warnings (for the `calloc` calls with
`int` values). The cost seems worth it and hopefully these warnings can be
removed in future.
This change has a performance impact. For smaller graphs, this likely slightly
degrades performance due to repeated small allocations that previously would not
have been required. For larger graphs, this perhaps improves performance as the
allocator no longer (spuriously) believes it needs to retain the contents of
`ps` across calls.
poly_gencode: remove claim that 'filled' is a boolean
This variable is not treated as a boolean within this function. Declaring it as
a boolean appears to have been a mistake and only worked out coincidentally as
all set values fit within the `boolean` type.
cdt: MSBuild: define GVDLL to ensure correct storage-class attributes
An upcoming commit will change the storage-class attributes to be
controlled by the GVDLL symbol in cdt.h.
Without this change, the following error would occur:
LINK : fatal error LNK1104: cannot open file 'C:\GitLab-Runner\builds\magjac\graphviz\Debug\Graphviz\bin\cdt.lib' [C:\GitLab-Runner\builds\magjac\graphviz\lib\pathplan\Pathplan.vcxproj]
Towards https://gitlab.com/graphviz/graphviz/-/issues/2173.
Magnus Jacobsson [Sun, 12 Dec 2021 11:27:44 +0000 (12:27 +0100)]
sparse: MSBuild: add windows include dir to find config.h
An upcoming commit which will include config.h in colorprocs.h would
otherwise cause this error:
C:\Users\magja\graphviz\lib\common\colorprocs.h(13,10): fatal error C1083: Cannot open include file: 'config.h': No such file or directory [C:\Users\magja\graphviz\lib\sparse\gvsparse.vcxproj]
cmd/mingle depends on lib/mingle, which in turn depends on libANN, a C++
library. Thus the `mingle` binary needs to link against the C++ standard
library. There is no advantage to Mingle being implemented in C, and some nice
advantages to it being implemented in C++ instead.
This commit does a basic rename, as AFAICT nothing in minglemain.c has varying
semantics between C and C++. Future commits will use C++ features to simplify
the code.
This has no effect at present. However, when moving this code to C++ in an
upcoming commit, it would trigger -fpermissive problems. This change
pre-emptively prevents this issue.
mingle: cast 'name' parameter values in 'agattr' calls
This has no effect at present. However, when moving this code to C++ in an
upcoming commit, it would trigger -Wwrite-strings warnings. This change
pre-emptively prevents these warnings.
This makes the intent of the code slightly clearer, but also pre-emptively
avoids an upcoming -Wwrite-strings warning when converting this code to C++.
The functions removed in this commit were intended to be aliases for the
same-named macros declared in cgraph.h. The claimed purpose is debugger
introspection.
It is unclear to me what value these have in a modern development environment.
Some modern debuggers can understand macro definitions. Those that cannot are
_impeded_ by these aliases. A developer debugging looks at the alias definition
and thinks they understand the code, but they do not. The code that is executing
on their system is _not_ the code these functions compile to. To state something
stronger: it is unclear to me how these definitions were ever helpful. They
appear to (accidentally) obscure what is actually occurring in the machine at
runtime.
Note that these functions also bloated the cgraph .so/.a size by including
functions that were never called.
These functions were introduced in c9b7b0719776e022d760195fae2727b84be82eda to
match `AGMKOUT` and `AGMKIN` (#1212). But there are no exposed prototypes for
these. So the only way to call them is to externally prototype them with a
best-guess type signature and hope Graphviz never changes. This commit removes
them to reduce portability problems.
libANN is now installed in all Red Hat environments in CI (CentOS and Fedora)
and building Mingle is enabled in all. So we remove this configuration flag that
is no longer used.
Magnus Jacobsson [Sat, 11 Dec 2021 14:57:39 +0000 (15:57 +0100)]
common: include config.h in colorprocs.h to get GVDLL in autotools builds
An upcoming commit that corrects the storage-class attribute
declarations in colorprocs.h would otherwise cause this error:
/usr/lib/gcc/x86_64-pc-cygwin/10/../../../../x86_64-pc-cygwin/bin/ld: ../../lib/sparse/.libs/libsparse_C.a(DotIO.o): in function `Import_coord_clusters_from_dot':
/home/magja/graphviz/lib/sparse/DotIO.c:577: undefined reference to `colorxlate'
Towards https://gitlab.com/graphviz/graphviz/-/issues/2058.
sgd_graph: use 'size_t' for 'sources' and 'targets'
Following on from 1c42bb82cd73cb45d3abee845c21819add00d982, this uses a more
appropriate type for these members, permitting collections that exceed 2³² - 1
and avoiding sign conversion issues.
prototype osage_layout and osage_cleanup in osage.h
These are the only functions lib/osage exports. Yet neither were prototyped in a
header. It seems like this header could now be #included in
plugin/neato_layout/gvlayout_neato_layout.c, removing the need for that file to
prototype these functions. Except that it gives slightly different prototypes
for them.
projects / graphviz / log