Remove mps_telemetry_control, deprecated since release 1.111.0.

This commit is contained in:
Gareth Rees 2020-09-27 12:50:44 +01:00
parent 1e77b9d762
commit 1f07197a31
7 changed files with 18 additions and 86 deletions

View file

@ -743,7 +743,6 @@ extern mps_res_t mps_definalize(mps_arena_t, mps_addr_t *);
/* Telemetry */
extern mps_word_t mps_telemetry_control(mps_word_t, mps_word_t);
extern void mps_telemetry_set(mps_word_t);
extern void mps_telemetry_reset(mps_word_t);
extern mps_word_t mps_telemetry_get(void);

View file

@ -1908,11 +1908,6 @@ const char *mps_message_gc_start_why(mps_arena_t arena,
/* TODO: need to consider locking. See job003387, job003388. */
mps_word_t mps_telemetry_control(mps_word_t resetMask, mps_word_t flipMask)
{
return EventControl((Word)resetMask, (Word)flipMask);
}
void mps_telemetry_set(mps_word_t setMask)
{
(void)EventControl((Word)setMask, (Word)setMask);

View file

@ -29,27 +29,10 @@ static char *stringArg;
static Count argCount;
static void callControl(mps_word_t reset, mps_word_t flip)
{
mps_word_t old, new;
old = mps_telemetry_control(reset, flip);
new = mps_telemetry_control((mps_word_t)0, (mps_word_t)0);
printf(WORD_FORMAT " -> " WORD_FORMAT "\n",
(ulongest_t)old, (ulongest_t)new);
}
static void doControl(void)
{
callControl(args[0], args[1]);
}
static void doRead(void)
static void doGet(void)
{
mps_word_t old;
old = mps_telemetry_control((mps_word_t)0, (mps_word_t)0);
old = mps_telemetry_get();
(void)printf(WORD_FORMAT "\n", (ulongest_t)old);
}
@ -57,19 +40,13 @@ static void doRead(void)
static void doSet(void)
{
callControl(args[0], args[0]);
mps_telemetry_set(args[0]);
}
static void doReset(void)
{
callControl(args[0], (mps_word_t)0);
}
static void doFlip(void)
{
callControl((mps_word_t)0, args[0]);
mps_telemetry_reset(args[0]);
}
@ -100,11 +77,9 @@ static void doQuit(void)
static void doHelp(void)
{
(void)printf("control <reset> <flip> -> <old> <new> Control filter\n"
"read -> <old> Read filter\n"
(void)printf("get -> <old> Get filter\n"
"set <mask> -> <old> <new> Set filter\n"
"reset <mask> -> <old> <new> Reset filter\n"
"flip <mask> -> <old> <new> Toggle filter\n");
"reset <mask> -> <old> <new> Reset filter\n");
(void)printf("intern <string> -> <id> Intern string\n"
"label <address> <id> Label address\n"
"flush Flush buffer\n"
@ -119,11 +94,9 @@ static struct commandShapeStruct {
mps_bool_t string_arg;
void (*fun)(void);
} commandShapes[] = {
{"control", 2, 0, doControl},
{"read", 0, 0, doRead},
{"get", 0, 0, doGet},
{"set", 1, 0, doSet},
{"reset", 1, 0, doReset},
{"flip", 1, 0, doFlip},
{"intern", 0, 1, doIntern},
{"label", 2, 0, doLabel},
{"flush", 0, 0, doFlush},

View file

@ -386,8 +386,9 @@ where the variable is set to a space-separated list of names defined by ``EventK
_`.control.just`: These controls are coarse, but very cheap.
_`.control.external`: The MPS interface function
``mps_telemetry_control`` can be used to change ``EventKindControl``.
_`.control.external`: The MPS interface functions
``mps_telemetry_set()`` and ``mps_telemetry_reset()`` can be used to
change ``EventKindControl``.
_`.control.tool`: The tools will be able to control
``EventKindControl``.

View file

@ -101,8 +101,9 @@ Memory Management Glossary: T
.. mps:specific::
A :term:`bitmap` indicating which events the MPS should
include in the :term:`telemetry stream`. It can be read or
changed by calling :c:func:`mps_telemetry_control`.
include in the :term:`telemetry stream`. It can be read by
calling :c:func:`mps_telemetry_get` or changed by calling
:c:func:`mps_telemetry_set` or :c:func:`mps_telemetry_reset`.
telemetry label

View file

@ -61,6 +61,11 @@ Interface changes
#. The deprecated function :c:func:`mps_fix` has been removed. Use
the macro :c:func:`MPS_FIX12` instead.
#. The deprecated function :c:func:`mps_telemetry_control` has been
removed. Use :c:func:`mps_telemetry_get`,
:c:func:`mps_telemetry_set` and :c:func:`mps_telemetry_reset`
instead.
#. The keyword argument ``MPS_KEY_SPARE_COMMIT_LIMIT`` to
:c:func:`mps_arena_create_k`, and the functions
:c:func:`mps_arena_spare_commit_limit` and

View file

@ -732,45 +732,3 @@ Deprecated in version 1.112
Create an :term:`object format` based on a description of an
object format of variant fixed.
.. index::
single: deprecated interfaces; in version 1.111
Deprecated in version 1.111
...........................
.. c:function:: mps_word_t mps_telemetry_control(mps_word_t reset_mask, mps_word_t flip_mask)
.. deprecated::
Use :c:func:`mps_telemetry_get`,
:c:func:`mps_telemetry_reset`, and :c:func:`mps_telemetry_set`
instead.
Update and return the :term:`telemetry filter`.
``reset_mask`` is a :term:`bitmask` indicating the bits in the
telemetry filter that should be reset.
``flip_mask`` is a bitmask indicating the bits in the telemetry
filter whose value should be flipped after the resetting.
Returns the previous value of the telemetry filter, prior to the
reset and the flip.
The parameters ``reset_mask`` and ``flip_mask`` allow the
specification of any binary operation on the filter control. For
typical operations, the parameters should be set as follows:
============ ============== =============
Operation ``reset_mask`` ``flip_mask``
============ ============== =============
``set(M)`` ``M`` ``M``
------------ -------------- -------------
``reset(M)`` ``M`` ``0``
------------ -------------- -------------
``flip(M)`` ``0`` ``M``
------------ -------------- -------------
``read()`` ``0`` ``0``
============ ============== =============