Git does not support the ability to replace a token with a version string during check-in. While it does have support for replacing a token on clone, this is somewhat sub-optimal: the token is replaced with the object hash, which is not particularly easy for human consumption. What's more, in practice, the source file version was often not terribly useful. Generally, when triaging bugs, the overall version of Asterisk is far more useful than an individual SVN version of a file. As a result, this patch removes Asterisk's support for showing source file versions. Specifically, it does the following: * Rename ASTERISK_FILE_VERSION macro to ASTERISK_REGISTER_FILE, and remove passing the version in with the macro. Other facilities than 'core show file version' make use of the file names, such as setting a debug level only on a specific file. As such, the act of registering source files with the Asterisk core still has use. The macro rename now reflects the new macro purpose. * main/asterisk: - Refactor the file_version structure to reflect that it no longer tracks a version field. - Remove the "core show file version" CLI command. Without the file version, it is no longer useful. - Remove the ast_file_version_find function. The file version is no longer tracked. - Rename ast_register_file_version/ast_unregister_file_version to ast_register_file/ast_unregister_file, respectively. * main/manager: Remove value from the Version key of the ModuleCheck Action. The actual key itself has not been removed, as doing so would absolutely constitute a backwards incompatible change. However, since the file version is no longer tracked, there is no need to attempt to include it in the Version key. * UPGRADE: Add notes for: - Modification to the ModuleCheck AMI Action - Removal of the "core show file version" CLI command Change-Id: I6cf0ff280e1668bf4957dc21f32a5ff43444a40e
167 lines
3.9 KiB
C
167 lines
3.9 KiB
C
/*
|
|
* Asterisk -- An open source telephony toolkit.
|
|
*
|
|
* Copyright (C) 2013, Digium, Inc.
|
|
*
|
|
* David M. Lee, II <dlee@digium.com>
|
|
*
|
|
* See http://www.asterisk.org for more information about
|
|
* the Asterisk project. Please do not directly contact
|
|
* any of the maintainers of this project for assistance;
|
|
* the project provides a web site, mailing lists and IRC
|
|
* channels for your use.
|
|
*
|
|
* This program is free software, distributed under the terms of
|
|
* the GNU General Public License Version 2. See the LICENSE file
|
|
* at the top of the source tree.
|
|
*/
|
|
|
|
/*! \file
|
|
*
|
|
* \brief Stasis application command support.
|
|
*
|
|
* \author David M. Lee, II <dlee@digium.com>
|
|
*/
|
|
|
|
#include "asterisk.h"
|
|
|
|
ASTERISK_REGISTER_FILE()
|
|
|
|
#include "command.h"
|
|
|
|
#include "asterisk/lock.h"
|
|
#include "asterisk/stasis_app_impl.h"
|
|
|
|
struct stasis_app_command {
|
|
ast_mutex_t lock;
|
|
ast_cond_t condition;
|
|
stasis_app_command_cb callback;
|
|
void *data;
|
|
command_data_destructor_fn data_destructor;
|
|
int retval;
|
|
int is_done:1;
|
|
};
|
|
|
|
static void command_dtor(void *obj)
|
|
{
|
|
struct stasis_app_command *command = obj;
|
|
|
|
if (command->data_destructor) {
|
|
command->data_destructor(command->data);
|
|
}
|
|
|
|
ast_mutex_destroy(&command->lock);
|
|
ast_cond_destroy(&command->condition);
|
|
}
|
|
|
|
struct stasis_app_command *command_create(
|
|
stasis_app_command_cb callback, void *data, command_data_destructor_fn data_destructor)
|
|
{
|
|
struct stasis_app_command *command;
|
|
|
|
command = ao2_alloc(sizeof(*command), command_dtor);
|
|
if (!command) {
|
|
if (data_destructor) {
|
|
data_destructor(data);
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
ast_mutex_init(&command->lock);
|
|
ast_cond_init(&command->condition, 0);
|
|
command->callback = callback;
|
|
command->data = data;
|
|
command->data_destructor = data_destructor;
|
|
|
|
return command;
|
|
}
|
|
|
|
void command_complete(struct stasis_app_command *command, int retval)
|
|
{
|
|
SCOPED_MUTEX(lock, &command->lock);
|
|
|
|
command->is_done = 1;
|
|
command->retval = retval;
|
|
ast_cond_signal(&command->condition);
|
|
}
|
|
|
|
int command_join(struct stasis_app_command *command)
|
|
{
|
|
SCOPED_MUTEX(lock, &command->lock);
|
|
while (!command->is_done) {
|
|
ast_cond_wait(&command->condition, &command->lock);
|
|
}
|
|
|
|
return command->retval;
|
|
}
|
|
|
|
void command_invoke(struct stasis_app_command *command,
|
|
struct stasis_app_control *control, struct ast_channel *chan)
|
|
{
|
|
int retval = command->callback(control, chan, command->data);
|
|
if (command->data_destructor) {
|
|
command->data_destructor(command->data);
|
|
command->data_destructor = NULL;
|
|
}
|
|
command_complete(command, retval);
|
|
}
|
|
|
|
static void command_queue_prestart_destroy(void *obj)
|
|
{
|
|
/* Clean up the container */
|
|
ao2_cleanup(obj);
|
|
}
|
|
|
|
static const struct ast_datastore_info command_queue_prestart = {
|
|
.type = "stasis-command-prestart-queue",
|
|
.destroy = command_queue_prestart_destroy,
|
|
};
|
|
|
|
int command_prestart_queue_command(struct ast_channel *chan,
|
|
stasis_app_command_cb command_fn, void *data, command_data_destructor_fn data_destructor)
|
|
{
|
|
struct ast_datastore *datastore;
|
|
struct ao2_container *command_queue;
|
|
RAII_VAR(struct stasis_app_command *, command,
|
|
command_create(command_fn, data, data_destructor), ao2_cleanup);
|
|
|
|
if (!command) {
|
|
return -1;
|
|
}
|
|
|
|
datastore = ast_channel_datastore_find(chan, &command_queue_prestart, NULL);
|
|
if (datastore) {
|
|
command_queue = datastore->data;
|
|
ao2_link(command_queue, command);
|
|
return 0;
|
|
}
|
|
|
|
command_queue = ao2_container_alloc_list(AO2_ALLOC_OPT_LOCK_MUTEX, 0, NULL, NULL);
|
|
if (!command_queue) {
|
|
return -1;
|
|
}
|
|
|
|
datastore = ast_datastore_alloc(&command_queue_prestart, NULL);
|
|
if (!datastore) {
|
|
ao2_cleanup(command_queue);
|
|
return -1;
|
|
}
|
|
ast_channel_datastore_add(chan, datastore);
|
|
|
|
datastore->data = command_queue;
|
|
ao2_link(command_queue, command);
|
|
|
|
return 0;
|
|
}
|
|
|
|
struct ao2_container *command_prestart_get_container(struct ast_channel *chan)
|
|
{
|
|
struct ast_datastore *datastore = ast_channel_datastore_find(chan, &command_queue_prestart, NULL);
|
|
|
|
if (!datastore) {
|
|
return NULL;
|
|
}
|
|
|
|
return ao2_bump(datastore->data);
|
|
}
|