mirror of
https://github.com/awesomeWM/awesome
synced 2024-11-17 07:47:41 +01:00
6f1df7a3ad
When a function is disconnected from a signal ("disconnect_signal") that is not
actually connected to the function, two things happened:
1. The attempt to remove the function from the signal array didn't do anything
2. Unreferencing the function noticed that the function wasn't referenced
The second step printed a big, fat scary warning.
Actually, this has the possibility of causing errors. For example, in the
following code, awesome would wrongly unreference the function at the
disconnect_signal() call and might later still try to call it when the
"refresh" signal is emitted:
do
local function f() end
awesome.connect_signal("refresh", f)
awesome.disconnect_signal("debug::error", f)
end
Fix this by making signal_disconnect() return a boolean value indicating if it
actually did something. All callers are fixed to use this value and only update
the reference counts if something was actually disconnected.
Fixes: https://github.com/awesomeWM/awesome/issues/814
Signed-off-by: Uli Schlachter <psychon@znc.in>
103 lines
2.8 KiB
C
103 lines
2.8 KiB
C
/*
|
|
* common/signal.h - Signal handling functions
|
|
*
|
|
* Copyright © 2009 Julien Danjou <julien@danjou.info>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*
|
|
*/
|
|
|
|
#ifndef AWESOME_COMMON_SIGNAL
|
|
#define AWESOME_COMMON_SIGNAL
|
|
|
|
#include "common/array.h"
|
|
|
|
DO_ARRAY(const void *, cptr, DO_NOTHING)
|
|
|
|
typedef struct
|
|
{
|
|
unsigned long id;
|
|
cptr_array_t sigfuncs;
|
|
} signal_t;
|
|
|
|
static inline int
|
|
signal_cmp(const void *a, const void *b)
|
|
{
|
|
const signal_t *x = a, *y = b;
|
|
return x->id > y->id ? 1 : (x->id < y->id ? -1 : 0);
|
|
}
|
|
|
|
static inline void
|
|
signal_wipe(signal_t *sig)
|
|
{
|
|
cptr_array_wipe(&sig->sigfuncs);
|
|
}
|
|
|
|
DO_BARRAY(signal_t, signal, signal_wipe, signal_cmp)
|
|
|
|
static inline signal_t *
|
|
signal_array_getbyid(signal_array_t *arr, unsigned long id)
|
|
{
|
|
signal_t sig = { .id = id };
|
|
return signal_array_lookup(arr, &sig);
|
|
}
|
|
|
|
/** Connect a signal inside a signal array.
|
|
* You are in charge of reference counting.
|
|
* \param arr The signal array.
|
|
* \param name The signal name.
|
|
* \param ref The reference to add.
|
|
*/
|
|
static inline void
|
|
signal_connect(signal_array_t *arr, const char *name, const void *ref)
|
|
{
|
|
unsigned long tok = a_strhash((const unsigned char *) name);
|
|
signal_t *sigfound = signal_array_getbyid(arr, tok);
|
|
if(sigfound)
|
|
cptr_array_append(&sigfound->sigfuncs, ref);
|
|
else
|
|
{
|
|
signal_t sig = { .id = tok };
|
|
cptr_array_append(&sig.sigfuncs, ref);
|
|
signal_array_insert(arr, sig);
|
|
}
|
|
}
|
|
|
|
/** Disconnect a signal inside a signal array.
|
|
* You are in charge of reference counting.
|
|
* \param arr The signal array.
|
|
* \param name The signal name.
|
|
* \param ref The reference to remove.
|
|
*/
|
|
static inline bool
|
|
signal_disconnect(signal_array_t *arr, const char *name, const void *ref)
|
|
{
|
|
signal_t *sigfound = signal_array_getbyid(arr,
|
|
a_strhash((const unsigned char *) name));
|
|
if(sigfound)
|
|
{
|
|
foreach(func, sigfound->sigfuncs)
|
|
if(ref == *func)
|
|
{
|
|
cptr_array_remove(&sigfound->sigfuncs, func);
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
#endif
|
|
|
|
// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
|