r4089 - trunk/bse
- From: timj svn gnome org
- To: svn-commits-list gnome org
- Subject: r4089 - trunk/bse
- Date: Mon, 20 Nov 2006 19:20:28 -0500 (EST)
Author: timj
Date: 2006-11-20 19:20:26 -0500 (Mon, 20 Nov 2006)
New Revision: 4089
Added:
trunk/bse/bsemain.cc
Removed:
trunk/bse/bsemain.c
Modified:
trunk/bse/ChangeLog
trunk/bse/Makefile.am
trunk/bse/bse.h
trunk/bse/bsecore.idl
trunk/bse/bseenginemaster.c
trunk/bse/bsejanitor.proc
trunk/bse/bseloader-aiff.c
trunk/bse/bsemain.h
trunk/bse/bsesequencer.cc
trunk/bse/bseserver.c
trunk/bse/gsldatacache.c
Log:
Mon Nov 20 23:39:51 2006 Tim Janik <timj gtk org>
* bsemain.cc: ported bsemain.c to C++, use C++ Msg API.
* bsemain.h: API adaptions due to bsemain.cc porting.
* bsecore.idl:
* bsejanitor.proc:
* bseserver.c: ported to new sfi_msg_* API.
* bsesequencer.cc: use bse_message_setup_thread_handler().
* bseenginemaster.c: use bse_message_setup_thread_handler() and
BIRNET_STATIC_ASSERT().
Modified: trunk/bse/ChangeLog
===================================================================
--- trunk/bse/ChangeLog 2006-11-21 00:19:43 UTC (rev 4088)
+++ trunk/bse/ChangeLog 2006-11-21 00:20:26 UTC (rev 4089)
@@ -1,3 +1,18 @@
+Mon Nov 20 23:39:51 2006 Tim Janik <timj gtk org>
+
+ * bsemain.cc: ported bsemain.c to C++, use C++ Msg API.
+
+ * bsemain.h: API adaptions due to bsemain.cc porting.
+
+ * bsecore.idl:
+ * bsejanitor.proc:
+ * bseserver.c: ported to new sfi_msg_* API.
+
+ * bsesequencer.cc: use bse_message_setup_thread_handler().
+
+ * bseenginemaster.c: use bse_message_setup_thread_handler() and
+ BIRNET_STATIC_ASSERT().
+
Wed Nov 15 00:59:15 2006 Tim Janik <timj gtk org>
* ldscript.map: restrict typeinfo symbol exports to Sfi/Bse/Birnet
Modified: trunk/bse/Makefile.am
===================================================================
--- trunk/bse/Makefile.am 2006-11-21 00:19:43 UTC (rev 4088)
+++ trunk/bse/Makefile.am 2006-11-21 00:20:26 UTC (rev 4089)
@@ -72,7 +72,7 @@
bseconstant.c bseconstvalues.c bsecontainer.c bsecontextmerger.c \
bsedatapocket.c bseeditablesample.c bseenums.c bsegconfig.c \
bseglobals.c bseglue.c bseitem.c bsejanitor.c \
- bsemain.c bsemath.c bsemathsignal.c bseladspa.c \
+ bsemain.cc bsemath.c bsemathsignal.c bseladspa.c \
bsemidicontroller.c bsemididevice.c bsedevice.c \
bsemididevice-null.c bsemididevice-oss.c bsemidievent.c bsemidinotifier.c \
bsemidireceiver.cc bsemidisynth.c bseobject.c bsepart.c \
Modified: trunk/bse/bse.h
===================================================================
--- trunk/bse/bse.h 2006-11-21 00:19:43 UTC (rev 4088)
+++ trunk/bse/bse.h 2006-11-21 00:20:26 UTC (rev 4089)
@@ -38,7 +38,7 @@
extern const guint bse_interface_age;
extern const guint bse_binary_age;
extern const gchar *bse_version;
-gchar* bse_check_version (guint required_major,
+const char* bse_check_version (guint required_major,
guint required_minor,
guint required_micro);
Modified: trunk/bse/bsecore.idl
===================================================================
--- trunk/bse/bsecore.idl 2006-11-21 00:19:43 UTC (rev 4088)
+++ trunk/bse/bsecore.idl 2006-11-21 00:20:26 UTC (rev 4089)
@@ -635,7 +635,7 @@
/* user messages */
choice MsgType {
MSG_NONE = Neutral,
- MSG_FATAL,
+ MSG_ALWAYS,
MSG_ERROR,
MSG_WARNING,
MSG_SCRIPT,
Modified: trunk/bse/bseenginemaster.c
===================================================================
--- trunk/bse/bseenginemaster.c 2006-11-21 00:19:43 UTC (rev 4088)
+++ trunk/bse/bseenginemaster.c 2006-11-21 00:20:26 UTC (rev 4089)
@@ -1132,16 +1132,16 @@
void
bse_engine_master_thread (EngineMasterData *mdata)
{
- sfi_msg_set_thread_handler (bse_msg_handler);
+ bse_message_setup_thread_handler ();
/* assert pollfd equality, since we're simply casting structures */
- g_static_assert (sizeof (struct pollfd) == sizeof (GPollFD));
- g_static_assert (G_STRUCT_OFFSET (GPollFD, fd) == G_STRUCT_OFFSET (struct pollfd, fd));
- g_static_assert (sizeof (((GPollFD*) 0)->fd) == sizeof (((struct pollfd*) 0)->fd));
- g_static_assert (G_STRUCT_OFFSET (GPollFD, events) == G_STRUCT_OFFSET (struct pollfd, events));
- g_static_assert (sizeof (((GPollFD*) 0)->events) == sizeof (((struct pollfd*) 0)->events));
- g_static_assert (G_STRUCT_OFFSET (GPollFD, revents) == G_STRUCT_OFFSET (struct pollfd, revents));
- g_static_assert (sizeof (((GPollFD*) 0)->revents) == sizeof (((struct pollfd*) 0)->revents));
+ BIRNET_STATIC_ASSERT (sizeof (struct pollfd) == sizeof (GPollFD));
+ BIRNET_STATIC_ASSERT (G_STRUCT_OFFSET (GPollFD, fd) == G_STRUCT_OFFSET (struct pollfd, fd));
+ BIRNET_STATIC_ASSERT (sizeof (((GPollFD*) 0)->fd) == sizeof (((struct pollfd*) 0)->fd));
+ BIRNET_STATIC_ASSERT (G_STRUCT_OFFSET (GPollFD, events) == G_STRUCT_OFFSET (struct pollfd, events));
+ BIRNET_STATIC_ASSERT (sizeof (((GPollFD*) 0)->events) == sizeof (((struct pollfd*) 0)->events));
+ BIRNET_STATIC_ASSERT (G_STRUCT_OFFSET (GPollFD, revents) == G_STRUCT_OFFSET (struct pollfd, revents));
+ BIRNET_STATIC_ASSERT (sizeof (((GPollFD*) 0)->revents) == sizeof (((struct pollfd*) 0)->revents));
/* add the thread wakeup pipe to master pollfds,
* so we get woken up in time.
Modified: trunk/bse/bsejanitor.proc
===================================================================
--- trunk/bse/bsejanitor.proc 2006-11-21 00:19:43 UTC (rev 4088)
+++ trunk/bse/bsejanitor.proc 2006-11-21 00:20:26 UTC (rev 4089)
@@ -394,7 +394,7 @@
const gchar *text2 = sfi_value_get_string (in_values++);
const gchar *text3 = sfi_value_get_string (in_values++);
const gchar *check = sfi_value_get_string (in_values++);
- SfiMsgType type = mtype ? sfi_msg_type_lookup (mtype) : 0;
+ SfiMsgType type = mtype ? sfi_msg_lookup_type (mtype) : 0;
/* check parameters */
if (!mtype || !(text1 || text2))
Modified: trunk/bse/bseloader-aiff.c
===================================================================
--- trunk/bse/bseloader-aiff.c 2006-11-21 00:19:43 UTC (rev 4088)
+++ trunk/bse/bseloader-aiff.c 2006-11-21 00:20:26 UTC (rev 4089)
@@ -226,7 +226,7 @@
guint32 chunk_size)
{
gint r;
- g_static_assert (sizeof (afile->instrument) == 20);
+ BIRNET_STATIC_ASSERT (sizeof (afile->instrument) == 20);
if (chunk_size < 20)
return BSE_ERROR_FORMAT_INVALID;
do
Deleted: trunk/bse/bsemain.c
===================================================================
--- trunk/bse/bsemain.c 2006-11-21 00:19:43 UTC (rev 4088)
+++ trunk/bse/bsemain.c 2006-11-21 00:20:26 UTC (rev 4089)
@@ -1,695 +0,0 @@
-/* BSE - Bedevilled Sound Engine
- * Copyright (C) 1997-1999, 2000-2003 Tim Janik
- *
- * This library 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 library 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-#include "bsemain.h"
-#include "topconfig.h"
-#include "bseserver.h"
-#include "bsesequencer.h"
-#include "bsejanitor.h"
-#include "bseplugin.h"
-#include "bsecategories.h"
-#include "bsemidireceiver.h"
-#include "bsemathsignal.h"
-#include "gsldatacache.h"
-#include "bsepcmdevice.h"
-#include "bsemididevice.h"
-#include "bseengine.h"
-#include "bseblockutils.hh" /* bse_block_impl_name() */
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <sfi/sfitests.h> /* sfti_test_init() */
-
-/* --- prototypes --- */
-static void bse_main_loop (gpointer data);
-static void bse_async_parse_args (gint *argc_p,
- gchar ***argv_p,
- BseMainArgs *margs,
- SfiInitValue values[]);
-
-
-/* --- variables --- */
-/* from bse.h */
-const guint bse_major_version = BSE_MAJOR_VERSION;
-const guint bse_minor_version = BSE_MINOR_VERSION;
-const guint bse_micro_version = BSE_MICRO_VERSION;
-const guint bse_interface_age = BSE_INTERFACE_AGE;
-const guint bse_binary_age = BSE_BINARY_AGE;
-const gchar *bse_version = BSE_VERSION;
-GMainContext *bse_main_context = NULL;
-BirnetMutex bse_main_sequencer_mutex = { 0, };
-BirnetThread *bse_main_thread = NULL;
-static volatile gboolean bse_initialization_stage = 0;
-static gboolean textdomain_setup = FALSE;
-static BseMainArgs default_main_args = {
- .path_binaries = BSE_PATH_BINARIES,
- .n_processors = 1,
- .wave_chunk_padding = 64,
- .wave_chunk_big_pad = 256,
- .dcache_block_size = 4000,
- .dcache_cache_memory = 10 * 1024 * 1024,
- .midi_kammer_note = BSE_KAMMER_NOTE, /* 69 */
- .kammer_freq = BSE_KAMMER_FREQUENCY, /* 440Hz, historically 435Hz */
- .force_fpu = false,
- .allow_randomization = true,
-};
-BseMainArgs *bse_main_args = NULL;
-
-
-/* --- functions --- */
-void
-bse_init_textdomain_only (void)
-{
- bindtextdomain (BSE_GETTEXT_DOMAIN, BST_PATH_LOCALE);
- bind_textdomain_codeset (BSE_GETTEXT_DOMAIN, "UTF-8");
- textdomain_setup = TRUE;
-}
-
-const gchar*
-bse_gettext (const gchar *text)
-{
- g_assert (textdomain_setup == TRUE);
- return dgettext (BSE_GETTEXT_DOMAIN, text);
-}
-
-void
-bse_init_async (gint *argc,
- gchar ***argv,
- const char *app_name,
- SfiInitValue values[])
-{
- BirnetThread *thread;
-
- bse_init_textdomain_only();
-
- if (bse_initialization_stage != 0)
- g_error ("%s() may only be called once", "bse_init_async");
- bse_initialization_stage++;
- if (bse_initialization_stage != 1)
- g_error ("%s() may only be called once", "bse_init_async");
-
- /* this function is running in the user program and needs to start the main BSE thread */
-
- /* paranoid assertions */
- g_assert (G_BYTE_ORDER == G_LITTLE_ENDIAN || G_BYTE_ORDER == G_BIG_ENDIAN);
-
- /* initialize submodules */
- sfi_init (argc, argv, app_name, values);
- bse_main_args = &default_main_args;
- bse_main_args->birnet = sfi_init_settings();
-
- /* handle argument early*/
- if (argc && argv)
- {
- if (*argc && !g_get_prgname ())
- g_set_prgname (**argv);
- bse_async_parse_args (argc, argv, bse_main_args, values);
- }
-
- /* start main BSE thread */
- thread = sfi_thread_run ("BSE Core", bse_main_loop, sfi_thread_self ());
- if (!thread)
- g_error ("failed to start seperate thread for BSE core");
-
- /* wait for initialization completion of the core thread */
- while (bse_initialization_stage < 2)
- sfi_thread_sleep (-1);
-}
-
-gchar*
-bse_check_version (guint required_major,
- guint required_minor,
- guint required_micro)
-{
- if (required_major > BSE_MAJOR_VERSION)
- return "BSE version too old (major mismatch)";
- if (required_major < BSE_MAJOR_VERSION)
- return "BSE version too new (major mismatch)";
- if (required_minor > BSE_MINOR_VERSION)
- return "BSE version too old (minor mismatch)";
- if (required_minor < BSE_MINOR_VERSION)
- return "BSE version too new (minor mismatch)";
- if (required_micro < BSE_MICRO_VERSION - BSE_BINARY_AGE)
- return "BSE version too new (micro mismatch)";
- if (required_micro > BSE_MICRO_VERSION)
- return "BSE version too old (micro mismatch)";
- return NULL;
-}
-
-typedef struct {
- SfiGlueContext *context;
- const gchar *client;
- BirnetThread *thread;
-} AsyncData;
-
-static gboolean
-async_create_context (gpointer data)
-{
- AsyncData *adata = data;
- SfiComPort *port1, *port2;
-
- sfi_com_port_create_linked ("Client", adata->thread, &port1,
- "Server", sfi_thread_self (), &port2);
- adata->context = sfi_glue_encoder_context (port1);
- bse_janitor_new (port2);
-
- /* wakeup client */
- sfi_thread_wakeup (adata->thread);
-
- return FALSE; /* single-shot */
-}
-
-SfiGlueContext*
-bse_init_glue_context (const gchar *client)
-{
- AsyncData adata = { 0, };
- GSource *source;
-
- g_return_val_if_fail (client != NULL, NULL);
-
- /* function runs in user threads and queues handler in BSE thread to create context */
-
- if (bse_initialization_stage < 2)
- g_error ("%s() called without prior %s()",
- "bse_init_glue_context",
- "bse_init_async");
-
- /* queue handler to create context */
- source = g_idle_source_new ();
- g_source_set_priority (source, G_PRIORITY_HIGH);
- adata.client = client;
- adata.thread = sfi_thread_self ();
- g_source_set_callback (source, async_create_context, &adata, NULL);
- g_source_attach (source, bse_main_context);
- g_source_unref (source);
- /* wake up BSE thread */
- g_main_context_wakeup (bse_main_context);
-
- /* wait til context creation */
- do
- sfi_thread_sleep (-1);
- while (!adata.context);
-
- return adata.context;
-}
-
-static void
-bse_init_core (void)
-{
- /* global threading things */
- sfi_mutex_init (&bse_main_sequencer_mutex);
- bse_main_context = g_main_context_new ();
- sfi_thread_set_wakeup ((BirnetThreadWakeup) g_main_context_wakeup,
- bse_main_context, NULL);
- sfi_msg_set_thread_handler (bse_msg_handler);
-
- /* initialize basic components */
- bse_globals_init ();
- _bse_init_signal();
- _bse_init_categories ();
- bse_type_init ();
- bse_cxx_init ();
-
- /* FIXME: global spawn dir is evil */
- {
- gchar *dir = g_get_current_dir ();
- sfi_com_set_spawn_dir (dir);
- g_free (dir);
- }
-
- /* initialize GSL components */
- gsl_init ();
-
- /* remaining BSE components */
- _bse_midi_init ();
- bse_plugin_init_builtins ();
- /* initialize C wrappers around C++ generated types */
- _bse_init_c_wrappers ();
-
- /* make sure the server is alive */
- bse_server_get ();
-
- /* load drivers early */
- if (bse_main_args->load_drivers_early)
- {
- SfiRing *ring = bse_plugin_path_list_files (TRUE, FALSE);
- while (ring)
- {
- gchar *name = sfi_ring_pop_head (&ring);
- const char *error = bse_plugin_check_load (name);
- if (error)
- sfi_diag ("while loading \"%s\": %s", name, error);
- g_free (name);
- }
- }
-
- /* dump device list */
- if (bse_main_args->dump_driver_list)
- {
- g_printerr (_("\nAvailable PCM drivers:\n"));
- bse_device_dump_list (BSE_TYPE_PCM_DEVICE, " ", TRUE, NULL, NULL);
- g_printerr (_("\nAvailable MIDI drivers:\n"));
- bse_device_dump_list (BSE_TYPE_MIDI_DEVICE, " ", TRUE, NULL, NULL);
- }
-}
-
-static gboolean single_thread_registration_done = FALSE;
-
-static void
-server_registration (SfiProxy server,
- BseRegistrationType rtype,
- const gchar *what,
- const gchar *error,
- gpointer data)
-{
- // BseRegistrationType rtype = bse_registration_type_from_choice (rchoice);
- if (rtype == BSE_REGISTER_DONE)
- single_thread_registration_done = TRUE;
- else
- {
- //gchar *base = strrchr (what, '/');
- //g_message (data, "%s", base ? base + 1 : what);
- if (error && error[0])
- sfi_diag ("failed to register \"%s\": %s", what, error);
- }
-}
-
-static void
-bse_init_intern (gint *argc,
- gchar ***argv,
- const char *app_name,
- SfiInitValue values[],
- bool as_test)
-{
- bse_init_textdomain_only();
-
- if (bse_initialization_stage != 0)
- g_error ("%s() may only be called once", "bse_init_intern");
- bse_initialization_stage++;
- if (bse_initialization_stage != 1)
- g_error ("%s() may only be called once", "bse_init_intern");
-
- /* paranoid assertions */
- g_assert (G_BYTE_ORDER == G_LITTLE_ENDIAN || G_BYTE_ORDER == G_BIG_ENDIAN);
-
- /* initialize submodules */
- if (as_test)
- sfi_init_test (argc, argv, values);
- else
- sfi_init (argc, argv, app_name, values);
- bse_main_args = &default_main_args;
- bse_main_args->birnet = sfi_init_settings();
-
- /* early argument handling */
- if (argc && argv)
- {
- if (*argc && !g_get_prgname ())
- g_set_prgname (**argv);
- bse_async_parse_args (argc, argv, bse_main_args, values);
- }
-
- bse_init_core ();
-
- /* initialize core plugins & scripts */
- if (bse_main_args->load_core_plugins || bse_main_args->load_core_scripts)
- g_object_connect (bse_server_get(), "signal::registration", server_registration, NULL, NULL);
- if (bse_main_args->load_core_plugins)
- {
- g_object_connect (bse_server_get(), "signal::registration", server_registration, NULL, NULL);
- SfiRing *ring = bse_plugin_path_list_files (!bse_main_args->load_drivers_early, TRUE);
- while (ring)
- {
- gchar *name = sfi_ring_pop_head (&ring);
- const char *error = bse_plugin_check_load (name);
- if (error)
- sfi_diag ("while loading \"%s\": %s", name, error);
- g_free (name);
- }
- }
- if (bse_main_args->load_core_scripts)
- {
- BseErrorType error = bse_item_exec (bse_server_get(), "register-scripts", NULL);
- if (error)
- sfi_diag ("during script registration: %s", bse_error_blurb (error));
- while (!single_thread_registration_done)
- {
- g_main_context_iteration (bse_main_context, TRUE);
- // sfi_glue_gc_run ();
- }
- }
- if (as_test)
- {
- SfiCPUInfo ci = sfi_cpu_info();
- char *cname = g_strdup_printf ("%s+%s", ci.machine, bse_block_impl_name());
- treport_cpu_name (cname);
- g_free (cname);
- }
- // sfi_glue_gc_run ();
-}
-
-void
-bse_init_inprocess (gint *argc,
- gchar ***argv,
- const char *app_name,
- SfiInitValue values[])
-{
- bse_init_intern (argc, argv, app_name, values, false);
-}
-
-void
-bse_init_test (gint *argc,
- gchar ***argv,
- SfiInitValue values[])
-{
- bse_init_intern (argc, argv, NULL, values, true);
-}
-
-static void
-bse_main_loop (gpointer data)
-{
- BirnetThread *client = data;
-
- bse_main_thread = sfi_thread_self ();
-
- bse_init_core ();
-
- /* start other threads */
- bse_sequencer_init_thread ();
-
- /* notify client about completion */
- bse_initialization_stage++; /* =2 */
- sfi_thread_wakeup (client);
-
- /* and away into the main loop */
- do
- {
- g_main_context_pending (bse_main_context);
- g_main_context_iteration (bse_main_context, TRUE);
- }
- while (!sfi_thread_aborted ());
-}
-
-guint
-bse_main_getpid (void)
-{
- if (bse_initialization_stage >= 2)
- return sfi_thread_self_pid ();
- else
- return 0;
-}
-
-static gboolean
-core_thread_send_message_async (gpointer data)
-{
- BseMessage *umsg = data;
- bse_server_send_message (bse_server_get(), umsg);
- bse_message_free (umsg);
- return FALSE;
-}
-
-/**
- * BSE log handler, suitable for sfi_msg_set_thread_handler().
- * This function is MT-safe and may be called from any thread.
- */
-void
-bse_msg_handler (const SfiMessage *lmsg)
-{
- /* this functions is called from multiple threads */
- if (!lmsg->primary && !lmsg->secondary)
- return;
- BseMessage *umsg = bse_message_new();
- g_free (umsg->log_domain);
- umsg->log_domain = g_strdup (lmsg->log_domain);
- g_static_assert (BSE_MSG_NONE == SFI_MSG_NONE);
- g_static_assert (BSE_MSG_FATAL == SFI_MSG_FATAL);
- g_static_assert (BSE_MSG_ERROR == SFI_MSG_ERROR);
- g_static_assert (BSE_MSG_WARNING == SFI_MSG_WARNING);
- g_static_assert (BSE_MSG_SCRIPT == SFI_MSG_SCRIPT);
- g_static_assert (BSE_MSG_INFO == SFI_MSG_INFO);
- g_static_assert (BSE_MSG_DIAG == SFI_MSG_DIAG);
- g_static_assert (BSE_MSG_DEBUG == SFI_MSG_DEBUG);
- umsg->type = lmsg->type;
- g_free (umsg->config_check);
- umsg->config_check = g_strdup (lmsg->config_check);
- g_free (umsg->title);
- umsg->title = g_strdup (lmsg->title);
- g_free (umsg->primary);
- umsg->primary = g_strdup (lmsg->primary);
- g_free (umsg->secondary);
- umsg->secondary = g_strdup (lmsg->secondary);
- g_free (umsg->details);
- umsg->details = g_strdup (lmsg->details);
- umsg->janitor = NULL;
- g_free (umsg->process);
- umsg->process = g_strdup (sfi_thread_get_name (NULL));
- umsg->pid = sfi_thread_get_pid (NULL);
- /* queue an idle handler in the BSE Core thread */
- bse_idle_next (core_thread_send_message_async, umsg);
-}
-
-static guint
-get_n_processors (void)
-{
-#ifdef _SC_NPROCESSORS_ONLN
- {
- gint n = sysconf (_SC_NPROCESSORS_ONLN);
-
- if (n > 0)
- return n;
- }
-#endif
- return 1;
-}
-
-static void
-bse_async_parse_args (gint *argc_p,
- gchar ***argv_p,
- BseMainArgs *margs,
- SfiInitValue values[])
-{
- guint argc = *argc_p;
- gchar **argv = *argv_p;
-
- /* this function is called before the main BSE thread is started,
- * so we can't use any BSE functions yet.
- */
-
- gchar *envar = getenv ("BSE_DEBUG");
- if (envar)
- sfi_msg_allow (envar);
- envar = getenv ("BSE_NO_DEBUG");
- if (envar)
- sfi_msg_deny (envar);
-
- guint i;
- for (i = 1; i < argc; i++)
- {
- if (strcmp (argv[i], "--g-fatal-warnings") == 0)
- {
- GLogLevelFlags fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK);
- fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL;
- g_log_set_always_fatal (fatal_mask);
- argv[i] = NULL;
- }
- else if (strcmp ("--bse-debug", argv[i]) == 0 ||
- strncmp ("--bse-debug=", argv[i], 12) == 0)
- {
- gchar *equal = argv[i] + 11;
- if (*equal == '=')
- sfi_msg_allow (equal + 1);
- else if (i + 1 < argc)
- {
- argv[i++] = NULL;
- sfi_msg_allow (argv[i]);
- }
- argv[i] = NULL;
- }
- else if (strcmp ("--bse-no-debug", argv[i]) == 0 ||
- strncmp ("--bse-no-debug=", argv[i], 15) == 0)
- {
- gchar *equal = argv[i] + 14;
- if (*equal == '=')
- sfi_msg_deny (equal + 1);
- else if (i + 1 < argc)
- {
- argv[i++] = NULL;
- sfi_msg_deny (argv[i]);
- }
- argv[i] = NULL;
- }
- else if (strcmp ("--bse-latency", argv[i]) == 0 ||
- strncmp ("--bse-latency=", argv[i], 14) == 0)
- {
- gchar *equal = argv[i] + 13;
- if (*equal == '=')
- margs->latency = g_ascii_strtoull (equal + 1, NULL, 10);
- else if (i + 1 < argc)
- {
- argv[i++] = NULL;
- margs->latency = g_ascii_strtoull (argv[i], NULL, 10);
- }
- argv[i] = NULL;
- }
- else if (strcmp ("--bse-mixing-freq", argv[i]) == 0 ||
- strncmp ("--bse-mixing-freq=", argv[i], 18) == 0)
- {
- gchar *equal = argv[i] + 17;
- if (*equal == '=')
- margs->mixing_freq = g_ascii_strtoull (equal + 1, NULL, 10);
- else if (i + 1 < argc)
- {
- argv[i++] = NULL;
- margs->mixing_freq = g_ascii_strtoull (argv[i], NULL, 10);
- }
- argv[i] = NULL;
- }
- else if (strcmp ("--bse-control-freq", argv[i]) == 0 ||
- strncmp ("--bse-control-freq=", argv[i], 19) == 0)
- {
- gchar *equal = argv[i] + 18;
- if (*equal == '=')
- margs->control_freq = g_ascii_strtoull (equal + 1, NULL, 10);
- else if (i + 1 < argc)
- {
- argv[i++] = NULL;
- margs->control_freq = g_ascii_strtoull (argv[i], NULL, 10);
- }
- argv[i] = NULL;
- }
- else if (strcmp ("--bse-driver-list", argv[i]) == 0)
- {
- margs->load_drivers_early = TRUE;
- margs->dump_driver_list = TRUE;
- argv[i] = NULL;
- }
- else if (strcmp ("--bse-pcm-driver", argv[i]) == 0)
- {
- if (i + 1 < argc)
- {
- argv[i++] = NULL;
- margs->pcm_drivers = sfi_ring_append (margs->pcm_drivers, argv[i]);
- }
- argv[i] = NULL;
- }
- else if (strcmp ("--bse-midi-driver", argv[i]) == 0)
- {
- if (i + 1 < argc)
- {
- argv[i++] = NULL;
- margs->midi_drivers = sfi_ring_append (margs->midi_drivers, argv[i]);
- }
- argv[i] = NULL;
- }
- else if (strcmp ("--bse-override-plugin-globs", argv[i]) == 0 && i + 1 < argc)
- {
- argv[i++] = NULL;
- margs->override_plugin_globs = argv[i];
- argv[i] = NULL;
- }
- else if (strcmp ("--bse-override-script-path", argv[i]) == 0 && i + 1 < argc)
- {
- argv[i++] = NULL;
- margs->override_script_path = argv[i];
- argv[i] = NULL;
- }
- else if (strcmp ("--bse-rcfile", argv[i]) == 0 && i + 1 < argc)
- {
- argv[i++] = NULL;
- g_free ((char*) margs->bse_rcfile);
- margs->bse_rcfile = g_strdup (argv[i]);
- argv[i] = NULL;
- }
-#if 0
- else if (strcmp ("--bse-override-binaries-path", argv[i]) == 0 && i + 1 < argc)
- {
- argv[i++] = NULL;
- margs->path_binaries = argv[i];
- argv[i] = NULL;
- }
-#endif
- else if (strcmp ("--bse-force-fpu", argv[i]) == 0)
- {
- margs->force_fpu = TRUE;
- argv[i] = NULL;
- }
- else if (strcmp ("--bse-disable-randomization", argv[i]) == 0)
- {
- margs->allow_randomization = FALSE;
- argv[i] = NULL;
- }
- else if (strcmp ("--bse-enable-randomization", argv[i]) == 0)
- {
- margs->allow_randomization = TRUE;
- argv[i] = NULL;
- }
- }
-
- if (!margs->bse_rcfile)
- margs->bse_rcfile = g_strconcat (g_get_home_dir (), "/.bserc", NULL);
-
- guint e = 1;
- for (i = 1; i < argc; i++)
- if (argv[i])
- {
- argv[e++] = argv[i];
- if (i >= e)
- argv[i] = NULL;
- }
- *argc_p = e;
-
- if (values)
- {
- SfiInitValue *value = values;
- while (value->value_name)
- {
- if (strcmp (value->value_name, "debug-extensions") == 0)
- margs->debug_extensions |= sfi_init_value_bool (value);
- else if (strcmp (value->value_name, "force-fpu") == 0)
- margs->force_fpu |= sfi_init_value_bool (value);
- else if (strcmp (value->value_name, "allow-randomization") == 0)
- margs->allow_randomization |= sfi_init_value_bool (value);
- else if (strcmp (value->value_name, "load-core-plugins") == 0)
- margs->load_core_plugins |= sfi_init_value_bool (value);
- else if (strcmp (value->value_name, "load-core-scripts") == 0)
- margs->load_core_scripts |= sfi_init_value_bool (value);
- else if (strcmp ("wave-chunk-padding", value->value_name) == 0)
- margs->wave_chunk_padding = sfi_init_value_int (value);
- else if (strcmp ("wave-chunk-big-pad", value->value_name) == 0)
- margs->wave_chunk_big_pad = sfi_init_value_int (value);
- else if (strcmp ("dcache-cache-memory", value->value_name) == 0)
- margs->dcache_cache_memory = sfi_init_value_int (value);
- else if (strcmp ("dcache-block-size", value->value_name) == 0)
- margs->dcache_block_size = sfi_init_value_int (value);
- else if (strcmp ("midi-kammer-note", value->value_name) == 0)
- margs->midi_kammer_note = sfi_init_value_int (value);
- else if (strcmp ("kammer-freq", value->value_name) == 0)
- margs->kammer_freq = sfi_init_value_double (value);
- value++;
- }
- }
-
- /* constrain (user) config */
- margs->wave_chunk_padding = MAX (1, margs->wave_chunk_padding);
- margs->wave_chunk_big_pad = MAX (2 * margs->wave_chunk_padding, margs->wave_chunk_big_pad);
- margs->dcache_block_size = MAX (2 * margs->wave_chunk_big_pad + sizeof (((GslDataCacheNode*) NULL)->data[0]), margs->dcache_block_size);
- margs->dcache_block_size = sfi_alloc_upper_power2 (margs->dcache_block_size - 1);
- /* margs->dcache_cache_memory = sfi_alloc_upper_power2 (margs->dcache_cache_memory); */
-
- /* non-configurable config updates */
- margs->n_processors = get_n_processors ();
-}
Copied: trunk/bse/bsemain.cc (from rev 4085, trunk/bse/bsemain.c)
===================================================================
--- trunk/bse/bsemain.c 2006-11-15 15:08:43 UTC (rev 4085)
+++ trunk/bse/bsemain.cc 2006-11-21 00:20:26 UTC (rev 4089)
@@ -0,0 +1,733 @@
+/* BSE - Bedevilled Sound Engine
+ * Copyright (C) 1997-1999, 2000-2003 Tim Janik
+ *
+ * This library 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 library 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ */
+#include "bsemain.h"
+#include "topconfig.h"
+#include "bseserver.h"
+#include "bsesequencer.h"
+#include "bsejanitor.h"
+#include "bseplugin.h"
+#include "bsecategories.h"
+#include "bsemidireceiver.h"
+#include "bsemathsignal.h"
+#include "gsldatacache.h"
+#include "bsepcmdevice.h"
+#include "bsemididevice.h"
+#include "bseengine.h"
+#include "bseblockutils.hh" /* bse_block_impl_name() */
+#include <string.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <sfi/sfitests.h> /* sfti_test_init() */
+
+using namespace Birnet;
+
+/* --- prototypes --- */
+static void bse_main_loop (gpointer data);
+static void bse_async_parse_args (gint *argc_p,
+ gchar ***argv_p,
+ BseMainArgs *margs,
+ SfiInitValue values[]);
+
+
+/* --- variables --- */
+/* from bse.h */
+const guint bse_major_version = BSE_MAJOR_VERSION;
+const guint bse_minor_version = BSE_MINOR_VERSION;
+const guint bse_micro_version = BSE_MICRO_VERSION;
+const guint bse_interface_age = BSE_INTERFACE_AGE;
+const guint bse_binary_age = BSE_BINARY_AGE;
+const gchar *bse_version = BSE_VERSION;
+GMainContext *bse_main_context = NULL;
+BirnetMutex bse_main_sequencer_mutex = { 0, };
+BirnetThread *bse_main_thread = NULL;
+static volatile gboolean bse_initialization_stage = 0;
+static gboolean textdomain_setup = FALSE;
+static BseMainArgs default_main_args = {
+ { 0, }, // BirnetInitSettings
+ 1, // n_processors
+ 64, // wave_chunk_padding
+ 256, // wave_chunk_big_pad
+ 4000, // dcache_block_size
+ 10 * 1024 * 1024, // dcache_cache_memory
+ BSE_KAMMER_NOTE, // midi_kammer_note (69)
+ BSE_KAMMER_FREQUENCY, // kammer_freq (440Hz, historically 435Hz)
+ BSE_PATH_BINARIES, // path_binaries
+ NULL, // bse_rcfile
+ NULL, // override_plugin_globs
+ NULL, // override_script_path
+ true, // allow_randomization
+ false, // force_fpu
+};
+BseMainArgs *bse_main_args = NULL;
+
+
+/* --- functions --- */
+void
+bse_init_textdomain_only (void)
+{
+ bindtextdomain (BSE_GETTEXT_DOMAIN, BST_PATH_LOCALE);
+ bind_textdomain_codeset (BSE_GETTEXT_DOMAIN, "UTF-8");
+ textdomain_setup = TRUE;
+}
+
+const gchar*
+bse_gettext (const gchar *text)
+{
+ g_assert (textdomain_setup == TRUE);
+ return dgettext (BSE_GETTEXT_DOMAIN, text);
+}
+
+void
+bse_init_async (gint *argc,
+ gchar ***argv,
+ const char *app_name,
+ SfiInitValue values[])
+{
+ BirnetThread *thread;
+
+ bse_init_textdomain_only();
+
+ if (bse_initialization_stage != 0)
+ g_error ("%s() may only be called once", "bse_init_async");
+ bse_initialization_stage++;
+ if (bse_initialization_stage != 1)
+ g_error ("%s() may only be called once", "bse_init_async");
+
+ /* this function is running in the user program and needs to start the main BSE thread */
+
+ /* paranoid assertions */
+ g_assert (G_BYTE_ORDER == G_LITTLE_ENDIAN || G_BYTE_ORDER == G_BIG_ENDIAN);
+
+ /* initialize submodules */
+ sfi_init (argc, argv, app_name, values);
+ bse_main_args = &default_main_args;
+ bse_main_args->birnet = sfi_init_settings();
+
+ /* handle argument early*/
+ if (argc && argv)
+ {
+ if (*argc && !g_get_prgname ())
+ g_set_prgname (**argv);
+ bse_async_parse_args (argc, argv, bse_main_args, values);
+ }
+
+ /* start main BSE thread */
+ thread = sfi_thread_run ("BSE Core", bse_main_loop, sfi_thread_self ());
+ if (!thread)
+ g_error ("failed to start seperate thread for BSE core");
+
+ /* wait for initialization completion of the core thread */
+ while (bse_initialization_stage < 2)
+ sfi_thread_sleep (-1);
+}
+
+const char*
+bse_check_version (guint required_major,
+ guint required_minor,
+ guint required_micro)
+{
+ if (required_major > BSE_MAJOR_VERSION)
+ return "BSE version too old (major mismatch)";
+ if (required_major < BSE_MAJOR_VERSION)
+ return "BSE version too new (major mismatch)";
+ if (required_minor > BSE_MINOR_VERSION)
+ return "BSE version too old (minor mismatch)";
+ if (required_minor < BSE_MINOR_VERSION)
+ return "BSE version too new (minor mismatch)";
+ if (required_micro < BSE_MICRO_VERSION - BSE_BINARY_AGE)
+ return "BSE version too new (micro mismatch)";
+ if (required_micro > BSE_MICRO_VERSION)
+ return "BSE version too old (micro mismatch)";
+ return NULL;
+}
+
+typedef struct {
+ SfiGlueContext *context;
+ const gchar *client;
+ BirnetThread *thread;
+} AsyncData;
+
+static gboolean
+async_create_context (gpointer data)
+{
+ AsyncData *adata = (AsyncData*) data;
+ SfiComPort *port1, *port2;
+
+ sfi_com_port_create_linked ("Client", adata->thread, &port1,
+ "Server", sfi_thread_self (), &port2);
+ adata->context = sfi_glue_encoder_context (port1);
+ bse_janitor_new (port2);
+
+ /* wakeup client */
+ sfi_thread_wakeup (adata->thread);
+
+ return FALSE; /* single-shot */
+}
+
+SfiGlueContext*
+bse_init_glue_context (const gchar *client)
+{
+ AsyncData adata = { 0, };
+ GSource *source;
+
+ g_return_val_if_fail (client != NULL, NULL);
+
+ /* function runs in user threads and queues handler in BSE thread to create context */
+
+ if (bse_initialization_stage < 2)
+ g_error ("%s() called without prior %s()",
+ "bse_init_glue_context",
+ "bse_init_async");
+
+ /* queue handler to create context */
+ source = g_idle_source_new ();
+ g_source_set_priority (source, G_PRIORITY_HIGH);
+ adata.client = client;
+ adata.thread = sfi_thread_self ();
+ g_source_set_callback (source, async_create_context, &adata, NULL);
+ g_source_attach (source, bse_main_context);
+ g_source_unref (source);
+ /* wake up BSE thread */
+ g_main_context_wakeup (bse_main_context);
+
+ /* wait til context creation */
+ do
+ sfi_thread_sleep (-1);
+ while (!adata.context);
+
+ return adata.context;
+}
+
+static void
+bse_init_core (void)
+{
+ /* global threading things */
+ sfi_mutex_init (&bse_main_sequencer_mutex);
+ bse_main_context = g_main_context_new ();
+ sfi_thread_set_wakeup ((BirnetThreadWakeup) g_main_context_wakeup,
+ bse_main_context, NULL);
+ bse_message_setup_thread_handler();
+
+ /* initialize basic components */
+ bse_globals_init ();
+ _bse_init_signal();
+ _bse_init_categories ();
+ bse_type_init ();
+ bse_cxx_init ();
+
+ /* FIXME: global spawn dir is evil */
+ {
+ gchar *dir = g_get_current_dir ();
+ sfi_com_set_spawn_dir (dir);
+ g_free (dir);
+ }
+
+ /* initialize GSL components */
+ gsl_init ();
+
+ /* remaining BSE components */
+ _bse_midi_init ();
+ bse_plugin_init_builtins ();
+ /* initialize C wrappers around C++ generated types */
+ _bse_init_c_wrappers ();
+
+ /* make sure the server is alive */
+ bse_server_get ();
+
+ /* load drivers early */
+ if (bse_main_args->load_drivers_early)
+ {
+ SfiRing *ring = bse_plugin_path_list_files (TRUE, FALSE);
+ while (ring)
+ {
+ gchar *name = (char*) sfi_ring_pop_head (&ring);
+ const char *error = bse_plugin_check_load (name);
+ if (error)
+ sfi_diag ("while loading \"%s\": %s", name, error);
+ g_free (name);
+ }
+ }
+
+ /* dump device list */
+ if (bse_main_args->dump_driver_list)
+ {
+ g_printerr (_("\nAvailable PCM drivers:\n"));
+ bse_device_dump_list (BSE_TYPE_PCM_DEVICE, " ", TRUE, NULL, NULL);
+ g_printerr (_("\nAvailable MIDI drivers:\n"));
+ bse_device_dump_list (BSE_TYPE_MIDI_DEVICE, " ", TRUE, NULL, NULL);
+ }
+}
+
+static gboolean single_thread_registration_done = FALSE;
+
+static void
+server_registration (SfiProxy server,
+ BseRegistrationType rtype,
+ const gchar *what,
+ const gchar *error,
+ gpointer data)
+{
+ // BseRegistrationType rtype = bse_registration_type_from_choice (rchoice);
+ if (rtype == BSE_REGISTER_DONE)
+ single_thread_registration_done = TRUE;
+ else
+ {
+ //gchar *base = strrchr (what, '/');
+ //g_message (data, "%s", base ? base + 1 : what);
+ if (error && error[0])
+ sfi_diag ("failed to register \"%s\": %s", what, error);
+ }
+}
+
+static void
+bse_init_intern (gint *argc,
+ gchar ***argv,
+ const char *app_name,
+ SfiInitValue values[],
+ bool as_test)
+{
+ bse_init_textdomain_only();
+
+ if (bse_initialization_stage != 0)
+ g_error ("%s() may only be called once", "bse_init_intern");
+ bse_initialization_stage++;
+ if (bse_initialization_stage != 1)
+ g_error ("%s() may only be called once", "bse_init_intern");
+
+ /* paranoid assertions */
+ g_assert (G_BYTE_ORDER == G_LITTLE_ENDIAN || G_BYTE_ORDER == G_BIG_ENDIAN);
+
+ /* initialize submodules */
+ if (as_test)
+ sfi_init_test (argc, argv, values);
+ else
+ sfi_init (argc, argv, app_name, values);
+ bse_main_args = &default_main_args;
+ bse_main_args->birnet = sfi_init_settings();
+
+ /* early argument handling */
+ if (argc && argv)
+ {
+ if (*argc && !g_get_prgname ())
+ g_set_prgname (**argv);
+ bse_async_parse_args (argc, argv, bse_main_args, values);
+ }
+
+ bse_init_core ();
+
+ /* initialize core plugins & scripts */
+ if (bse_main_args->load_core_plugins || bse_main_args->load_core_scripts)
+ g_object_connect (bse_server_get(), "signal::registration", server_registration, NULL, NULL);
+ if (bse_main_args->load_core_plugins)
+ {
+ g_object_connect (bse_server_get(), "signal::registration", server_registration, NULL, NULL);
+ SfiRing *ring = bse_plugin_path_list_files (!bse_main_args->load_drivers_early, TRUE);
+ while (ring)
+ {
+ gchar *name = (char*) sfi_ring_pop_head (&ring);
+ const char *error = bse_plugin_check_load (name);
+ if (error)
+ sfi_diag ("while loading \"%s\": %s", name, error);
+ g_free (name);
+ }
+ }
+ if (bse_main_args->load_core_scripts)
+ {
+ BseErrorType error = bse_item_exec (bse_server_get(), "register-scripts", NULL);
+ if (error)
+ sfi_diag ("during script registration: %s", bse_error_blurb (error));
+ while (!single_thread_registration_done)
+ {
+ g_main_context_iteration (bse_main_context, TRUE);
+ // sfi_glue_gc_run ();
+ }
+ }
+ if (as_test)
+ {
+ SfiCPUInfo ci = sfi_cpu_info();
+ char *cname = g_strdup_printf ("%s+%s", ci.machine, bse_block_impl_name());
+ treport_cpu_name (cname);
+ g_free (cname);
+ }
+ // sfi_glue_gc_run ();
+}
+
+void
+bse_init_inprocess (gint *argc,
+ gchar ***argv,
+ const char *app_name,
+ SfiInitValue values[])
+{
+ bse_init_intern (argc, argv, app_name, values, false);
+}
+
+void
+bse_init_test (gint *argc,
+ gchar ***argv,
+ SfiInitValue values[])
+{
+ bse_init_intern (argc, argv, NULL, values, true);
+}
+
+static void
+bse_main_loop (gpointer data)
+{
+ BirnetThread *client = (BirnetThread*) data;
+
+ bse_main_thread = sfi_thread_self ();
+
+ bse_init_core ();
+
+ /* start other threads */
+ bse_sequencer_init_thread ();
+
+ /* notify client about completion */
+ bse_initialization_stage++; /* =2 */
+ sfi_thread_wakeup (client);
+
+ /* and away into the main loop */
+ do
+ {
+ g_main_context_pending (bse_main_context);
+ g_main_context_iteration (bse_main_context, TRUE);
+ }
+ while (!sfi_thread_aborted ());
+}
+
+guint
+bse_main_getpid (void)
+{
+ if (bse_initialization_stage >= 2)
+ return sfi_thread_self_pid ();
+ else
+ return 0;
+}
+
+static gboolean
+core_thread_send_message_async (gpointer data)
+{
+ BseMessage *umsg = (BseMessage*) data;
+ bse_server_send_message (bse_server_get(), umsg);
+ bse_message_free (umsg);
+ return FALSE;
+}
+
+/**
+ * BSE log handler, suitable for sfi_msg_set_thread_handler().
+ * This function is MT-safe and may be called from any thread.
+ */
+static void
+bse_msg_handler (const char *domain,
+ Msg::Type mtype,
+ const vector<Msg::Part> &parts)
+{
+ /* this function is called from multiple threads */
+ BIRNET_STATIC_ASSERT (BSE_MSG_NONE == (int) Birnet::Msg::NONE);
+ BIRNET_STATIC_ASSERT (BSE_MSG_ALWAYS == (int) Birnet::Msg::ALWAYS);
+ BIRNET_STATIC_ASSERT (BSE_MSG_ERROR == (int) Birnet::Msg::ERROR);
+ BIRNET_STATIC_ASSERT (BSE_MSG_WARNING == (int) Birnet::Msg::WARNING);
+ BIRNET_STATIC_ASSERT (BSE_MSG_SCRIPT == (int) Birnet::Msg::SCRIPT);
+ BIRNET_STATIC_ASSERT (BSE_MSG_INFO == (int) Birnet::Msg::INFO);
+ BIRNET_STATIC_ASSERT (BSE_MSG_DIAG == (int) Birnet::Msg::DIAG);
+ BIRNET_STATIC_ASSERT (BSE_MSG_DEBUG == (int) Birnet::Msg::DEBUG);
+ String title, primary, secondary, details, checkmsg;
+ for (uint i = 0; i < parts.size(); i++)
+ switch (parts[i].ptype)
+ {
+ case '0': title += (title.size() ? "\n" : "") + parts[i].string; break;
+ case '1': primary += (primary.size() ? "\n" : "") + parts[i].string; break;
+ case '2': secondary += (secondary.size() ? "\n" : "") + parts[i].string; break;
+ case '3': details += (details.size() ? "\n" : "") + parts[i].string; break;
+ case 'c': checkmsg += (checkmsg.size() ? "\n" : "") + parts[i].string; break;
+ }
+ if (!primary.size() && !secondary.size())
+ return;
+ BseMessage *umsg = bse_message_new();
+ g_free (umsg->log_domain);
+ umsg->log_domain = g_strdup (domain);
+ umsg->type = BseMsgType (mtype);
+ g_free (umsg->title);
+ umsg->title = g_strdup (title.c_str());
+ g_free (umsg->primary);
+ umsg->primary = g_strdup (primary.c_str());
+ g_free (umsg->secondary);
+ umsg->secondary = g_strdup (secondary.c_str());
+ g_free (umsg->details);
+ umsg->details = g_strdup (details.c_str());
+ g_free (umsg->config_check);
+ umsg->config_check = g_strdup (checkmsg.c_str());
+ umsg->janitor = NULL;
+ g_free (umsg->process);
+ umsg->process = g_strdup (sfi_thread_get_name (NULL));
+ umsg->pid = sfi_thread_get_pid (NULL);
+ /* queue an idle handler in the BSE Core thread */
+ bse_idle_next (core_thread_send_message_async, umsg);
+}
+
+void
+bse_message_setup_thread_handler (void)
+{
+ Birnet::Msg::set_thread_handler (bse_msg_handler);
+}
+
+void
+bse_message_to_default_handler (const BseMessage *msg)
+{
+ vector<Msg::Part> parts;
+ if (msg->title)
+ parts.push_back (Msg::Title (String (msg->title)));
+ if (msg->primary)
+ parts.push_back (Msg::Primary (String (msg->primary)));
+ if (msg->secondary)
+ parts.push_back (Msg::Secondary (String (msg->secondary)));
+ if (msg->details)
+ parts.push_back (Msg::Detail (String (msg->details)));
+ if (msg->config_check)
+ parts.push_back (Msg::Check (String (msg->config_check)));
+ Msg::default_handler (msg->log_domain, Msg::Type (msg->type), parts);
+}
+
+static guint
+get_n_processors (void)
+{
+#ifdef _SC_NPROCESSORS_ONLN
+ gint n = sysconf (_SC_NPROCESSORS_ONLN);
+ if (n > 0)
+ return n;
+#endif
+ return 1;
+}
+
+static void
+bse_async_parse_args (gint *argc_p,
+ gchar ***argv_p,
+ BseMainArgs *margs,
+ SfiInitValue values[])
+{
+ guint argc = *argc_p;
+ gchar **argv = *argv_p;
+
+ /* this function is called before the main BSE thread is started,
+ * so we can't use any BSE functions yet.
+ */
+
+ gchar *envar = getenv ("BSE_DEBUG");
+ if (envar)
+ sfi_msg_allow (envar);
+ envar = getenv ("BSE_NO_DEBUG");
+ if (envar)
+ sfi_msg_deny (envar);
+
+ guint i;
+ for (i = 1; i < argc; i++)
+ {
+ if (strcmp (argv[i], "--g-fatal-warnings") == 0)
+ {
+ GLogLevelFlags fatal_mask = (GLogLevelFlags) g_log_set_always_fatal ((GLogLevelFlags) G_LOG_FATAL_MASK);
+ fatal_mask = (GLogLevelFlags) (fatal_mask | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL);
+ g_log_set_always_fatal (fatal_mask);
+ argv[i] = NULL;
+ }
+ else if (strcmp ("--bse-debug", argv[i]) == 0 ||
+ strncmp ("--bse-debug=", argv[i], 12) == 0)
+ {
+ gchar *equal = argv[i] + 11;
+ if (*equal == '=')
+ sfi_msg_allow (equal + 1);
+ else if (i + 1 < argc)
+ {
+ argv[i++] = NULL;
+ sfi_msg_allow (argv[i]);
+ }
+ argv[i] = NULL;
+ }
+ else if (strcmp ("--bse-no-debug", argv[i]) == 0 ||
+ strncmp ("--bse-no-debug=", argv[i], 15) == 0)
+ {
+ gchar *equal = argv[i] + 14;
+ if (*equal == '=')
+ sfi_msg_deny (equal + 1);
+ else if (i + 1 < argc)
+ {
+ argv[i++] = NULL;
+ sfi_msg_deny (argv[i]);
+ }
+ argv[i] = NULL;
+ }
+ else if (strcmp ("--bse-latency", argv[i]) == 0 ||
+ strncmp ("--bse-latency=", argv[i], 14) == 0)
+ {
+ gchar *equal = argv[i] + 13;
+ if (*equal == '=')
+ margs->latency = g_ascii_strtoull (equal + 1, NULL, 10);
+ else if (i + 1 < argc)
+ {
+ argv[i++] = NULL;
+ margs->latency = g_ascii_strtoull (argv[i], NULL, 10);
+ }
+ argv[i] = NULL;
+ }
+ else if (strcmp ("--bse-mixing-freq", argv[i]) == 0 ||
+ strncmp ("--bse-mixing-freq=", argv[i], 18) == 0)
+ {
+ gchar *equal = argv[i] + 17;
+ if (*equal == '=')
+ margs->mixing_freq = g_ascii_strtoull (equal + 1, NULL, 10);
+ else if (i + 1 < argc)
+ {
+ argv[i++] = NULL;
+ margs->mixing_freq = g_ascii_strtoull (argv[i], NULL, 10);
+ }
+ argv[i] = NULL;
+ }
+ else if (strcmp ("--bse-control-freq", argv[i]) == 0 ||
+ strncmp ("--bse-control-freq=", argv[i], 19) == 0)
+ {
+ gchar *equal = argv[i] + 18;
+ if (*equal == '=')
+ margs->control_freq = g_ascii_strtoull (equal + 1, NULL, 10);
+ else if (i + 1 < argc)
+ {
+ argv[i++] = NULL;
+ margs->control_freq = g_ascii_strtoull (argv[i], NULL, 10);
+ }
+ argv[i] = NULL;
+ }
+ else if (strcmp ("--bse-driver-list", argv[i]) == 0)
+ {
+ margs->load_drivers_early = TRUE;
+ margs->dump_driver_list = TRUE;
+ argv[i] = NULL;
+ }
+ else if (strcmp ("--bse-pcm-driver", argv[i]) == 0)
+ {
+ if (i + 1 < argc)
+ {
+ argv[i++] = NULL;
+ margs->pcm_drivers = sfi_ring_append (margs->pcm_drivers, argv[i]);
+ }
+ argv[i] = NULL;
+ }
+ else if (strcmp ("--bse-midi-driver", argv[i]) == 0)
+ {
+ if (i + 1 < argc)
+ {
+ argv[i++] = NULL;
+ margs->midi_drivers = sfi_ring_append (margs->midi_drivers, argv[i]);
+ }
+ argv[i] = NULL;
+ }
+ else if (strcmp ("--bse-override-plugin-globs", argv[i]) == 0 && i + 1 < argc)
+ {
+ argv[i++] = NULL;
+ margs->override_plugin_globs = argv[i];
+ argv[i] = NULL;
+ }
+ else if (strcmp ("--bse-override-script-path", argv[i]) == 0 && i + 1 < argc)
+ {
+ argv[i++] = NULL;
+ margs->override_script_path = argv[i];
+ argv[i] = NULL;
+ }
+ else if (strcmp ("--bse-rcfile", argv[i]) == 0 && i + 1 < argc)
+ {
+ argv[i++] = NULL;
+ g_free ((char*) margs->bse_rcfile);
+ margs->bse_rcfile = g_strdup (argv[i]);
+ argv[i] = NULL;
+ }
+#if 0
+ else if (strcmp ("--bse-override-binaries-path", argv[i]) == 0 && i + 1 < argc)
+ {
+ argv[i++] = NULL;
+ margs->path_binaries = argv[i];
+ argv[i] = NULL;
+ }
+#endif
+ else if (strcmp ("--bse-force-fpu", argv[i]) == 0)
+ {
+ margs->force_fpu = TRUE;
+ argv[i] = NULL;
+ }
+ else if (strcmp ("--bse-disable-randomization", argv[i]) == 0)
+ {
+ margs->allow_randomization = FALSE;
+ argv[i] = NULL;
+ }
+ else if (strcmp ("--bse-enable-randomization", argv[i]) == 0)
+ {
+ margs->allow_randomization = TRUE;
+ argv[i] = NULL;
+ }
+ }
+
+ if (!margs->bse_rcfile)
+ margs->bse_rcfile = g_strconcat (g_get_home_dir (), "/.bserc", NULL);
+
+ guint e = 1;
+ for (i = 1; i < argc; i++)
+ if (argv[i])
+ {
+ argv[e++] = argv[i];
+ if (i >= e)
+ argv[i] = NULL;
+ }
+ *argc_p = e;
+
+ if (values)
+ {
+ SfiInitValue *value = values;
+ while (value->value_name)
+ {
+ if (strcmp (value->value_name, "debug-extensions") == 0)
+ margs->debug_extensions |= sfi_init_value_bool (value);
+ else if (strcmp (value->value_name, "force-fpu") == 0)
+ margs->force_fpu |= sfi_init_value_bool (value);
+ else if (strcmp (value->value_name, "allow-randomization") == 0)
+ margs->allow_randomization |= sfi_init_value_bool (value);
+ else if (strcmp (value->value_name, "load-core-plugins") == 0)
+ margs->load_core_plugins |= sfi_init_value_bool (value);
+ else if (strcmp (value->value_name, "load-core-scripts") == 0)
+ margs->load_core_scripts |= sfi_init_value_bool (value);
+ else if (strcmp ("wave-chunk-padding", value->value_name) == 0)
+ margs->wave_chunk_padding = sfi_init_value_int (value);
+ else if (strcmp ("wave-chunk-big-pad", value->value_name) == 0)
+ margs->wave_chunk_big_pad = sfi_init_value_int (value);
+ else if (strcmp ("dcache-cache-memory", value->value_name) == 0)
+ margs->dcache_cache_memory = sfi_init_value_int (value);
+ else if (strcmp ("dcache-block-size", value->value_name) == 0)
+ margs->dcache_block_size = sfi_init_value_int (value);
+ else if (strcmp ("midi-kammer-note", value->value_name) == 0)
+ margs->midi_kammer_note = sfi_init_value_int (value);
+ else if (strcmp ("kammer-freq", value->value_name) == 0)
+ margs->kammer_freq = sfi_init_value_double (value);
+ value++;
+ }
+ }
+
+ /* constrain (user) config */
+ margs->wave_chunk_padding = MAX (1, margs->wave_chunk_padding);
+ margs->wave_chunk_big_pad = MAX (2 * margs->wave_chunk_padding, margs->wave_chunk_big_pad);
+ margs->dcache_block_size = MAX (2 * margs->wave_chunk_big_pad + sizeof (((GslDataCacheNode*) NULL)->data[0]), margs->dcache_block_size);
+ margs->dcache_block_size = sfi_alloc_upper_power2 (margs->dcache_block_size - 1);
+ /* margs->dcache_cache_memory = sfi_alloc_upper_power2 (margs->dcache_cache_memory); */
+
+ /* non-configurable config updates */
+ margs->n_processors = get_n_processors ();
+}
Modified: trunk/bse/bsemain.h
===================================================================
--- trunk/bse/bsemain.h 2006-11-21 00:19:43 UTC (rev 4088)
+++ trunk/bse/bsemain.h 2006-11-21 00:20:26 UTC (rev 4089)
@@ -19,6 +19,7 @@
#define __BSE_MAIN_H__
#include <bse/bse.h> /* initialization */
+#include <bse/bsetype.h>
G_BEGIN_DECLS
@@ -31,7 +32,7 @@
const char *app_name,
SfiInitValue values[]);
SfiGlueContext* bse_init_glue_context (const gchar *client);
-gchar* bse_check_version (guint required_major,
+const char* bse_check_version (guint required_major,
guint required_minor,
guint required_micro);
#endif
@@ -47,8 +48,9 @@
/* BSE thread pid (or 0) */
guint bse_main_getpid (void);
-/* MT-safe log handler */
-void bse_msg_handler (const SfiMessage *message);
+/* messaging */
+void bse_message_setup_thread_handler (void);
+void bse_message_to_default_handler (const BseMessage *msg);
/* --- global macros --- */
#define BSE_THREADS_ENTER() // bse_main_global_lock ()
@@ -60,34 +62,34 @@
/* --- argc/argv overide settings --- */
typedef struct {
- BirnetInitSettings birnet;
- int latency;
- int mixing_freq;
- int control_freq;
- SfiRing *pcm_drivers;
- SfiRing *midi_drivers;
- bool debug_extensions; /* init-value "debug-extensions" */
- bool load_drivers_early;
- bool dump_driver_list;
- bool load_core_plugins; /* init-value "load-core-plugins" */
- bool load_core_scripts; /* init-value "load-core-scripts" */
- bool force_fpu; /* init-value "force-fpu" */
- bool allow_randomization; /* init-value "allow-randomization" - enables non-deterministic behavior */
- const gchar *bse_rcfile;
- const gchar *override_plugin_globs;
- const gchar *override_script_path;
- const gchar *path_binaries;
- guint n_processors;
+ BirnetInitSettings birnet;
+ guint n_processors;
/* # values to pad around wave chunk blocks per channel */
- guint wave_chunk_padding;
- guint wave_chunk_big_pad;
+ guint wave_chunk_padding;
+ guint wave_chunk_big_pad;
/* data (file) cache block size (aligned to power of 2) */
- guint dcache_block_size;
+ guint dcache_block_size;
/* amount of bytes to spare for memory cache */
- guint dcache_cache_memory;
- guint midi_kammer_note;
+ guint dcache_cache_memory;
+ guint midi_kammer_note;
/* kammer frequency, normally 440Hz, historically 435Hz */
- gfloat kammer_freq;
+ gfloat kammer_freq;
+ const gchar *path_binaries;
+ const gchar *bse_rcfile;
+ const gchar *override_plugin_globs;
+ const gchar *override_script_path;
+ bool allow_randomization; /* init-value "allow-randomization" - enables non-deterministic behavior */
+ bool force_fpu; /* init-value "force-fpu" */
+ bool load_core_plugins; /* init-value "load-core-plugins" */
+ bool load_core_scripts; /* init-value "load-core-scripts" */
+ bool debug_extensions; /* init-value "debug-extensions" */
+ bool load_drivers_early;
+ bool dump_driver_list;
+ int latency;
+ int mixing_freq;
+ int control_freq;
+ SfiRing *pcm_drivers;
+ SfiRing *midi_drivers;
} BseMainArgs;
Modified: trunk/bse/bsesequencer.cc
===================================================================
--- trunk/bse/bsesequencer.cc 2006-11-21 00:19:43 UTC (rev 4088)
+++ trunk/bse/bsesequencer.cc 2006-11-21 00:20:26 UTC (rev 4089)
@@ -406,7 +406,7 @@
{
DEBUG ("SST: start\n");
sfi_thread_set_wakeup (sequencer_wake_up, NULL, NULL);
- sfi_msg_set_thread_handler (bse_msg_handler);
+ bse_message_setup_thread_handler();
BSE_SEQUENCER_LOCK ();
do
{
Modified: trunk/bse/bseserver.c
===================================================================
--- trunk/bse/bseserver.c 2006-11-21 00:19:43 UTC (rev 4088)
+++ trunk/bse/bseserver.c 2006-11-21 00:20:26 UTC (rev 4089)
@@ -449,19 +449,19 @@
{
server->pcm_input_checked = TRUE;
if (!BSE_DEVICE_READABLE (server->pcm_device))
- sfi_msg_log (SFI_MSG_WARNING,
- SFI_MSG_TITLE (_("Recording Audio Input")),
- SFI_MSG_TEXT1 (_("Failed to start recording from audio device.")),
- SFI_MSG_TEXT2 (_("An audio project is in use which processes an audio input signal, but the audio device "
- "has not been opened in recording mode. "
- "An audio signal of silence will be used instead of a recorded signal, "
- "so playback operation may produce results not actually intended "
- "(such as a silent output signal).")),
- SFI_MSG_TEXT3 (_("Audio device \"%s\" is not open for input, audio driver: %s=%s"),
- BSE_DEVICE (server->pcm_device)->open_device_name,
- BSE_DEVICE_GET_CLASS (server->pcm_device)->driver_name,
- BSE_DEVICE (server->pcm_device)->open_device_args),
- SFI_MSG_CHECK (_("Show messages about audio input problems")));
+ sfi_msg_display (SFI_MSG_WARNING,
+ SFI_MSG_TITLE (_("Recording Audio Input")),
+ SFI_MSG_TEXT1 (_("Failed to start recording from audio device.")),
+ SFI_MSG_TEXT2 (_("An audio project is in use which processes an audio input signal, but the audio device "
+ "has not been opened in recording mode. "
+ "An audio signal of silence will be used instead of a recorded signal, "
+ "so playback operation may produce results not actually intended "
+ "(such as a silent output signal).")),
+ SFI_MSG_TEXT3 (_("Audio device \"%s\" is not open for input, audio driver: %s=%s"),
+ BSE_DEVICE (server->pcm_device)->open_device_name,
+ BSE_DEVICE_GET_CLASS (server->pcm_device)->driver_name,
+ BSE_DEVICE (server->pcm_device)->open_device_args),
+ SFI_MSG_CHECK (_("Show messages about audio input problems")));
}
}
@@ -502,13 +502,13 @@
bse_main_args->pcm_drivers,
pcm_request_callback, &pr, error ? NULL : &error);
if (!server->pcm_device)
- sfi_msg_log (SFI_MSG_ERROR,
- SFI_MSG_TITLE (_("No Audio")),
- SFI_MSG_TEXT1 (_("No available audio device was found.")),
- SFI_MSG_TEXT2 (_("No available audio device could be found and opened successfully. "
- "Sorry, no fallback selection can be made for audio devices, giving up.")),
- SFI_MSG_TEXT3 (_("Failed to open PCM devices: %s"), bse_error_blurb (error)),
- SFI_MSG_CHECK (_("Show messages about PCM device selections problems")));
+ sfi_msg_display (SFI_MSG_ERROR,
+ SFI_MSG_TITLE (_("No Audio")),
+ SFI_MSG_TEXT1 (_("No available audio device was found.")),
+ SFI_MSG_TEXT2 (_("No available audio device could be found and opened successfully. "
+ "Sorry, no fallback selection can be made for audio devices, giving up.")),
+ SFI_MSG_TEXT3 (_("Failed to open PCM devices: %s"), bse_error_blurb (error)),
+ SFI_MSG_CHECK (_("Show messages about PCM device selections problems")));
server->pcm_input_checked = FALSE;
return server->pcm_device ? BSE_ERROR_NONE : error;
}
@@ -526,13 +526,13 @@
server->midi_device = (BseMidiDevice*) bse_device_open_best (BSE_TYPE_MIDI_DEVICE_NULL, TRUE, FALSE, ring, NULL, NULL, NULL);
sfi_ring_free (ring);
if (server->midi_device)
- sfi_msg_log (SFI_MSG_WARNING,
- SFI_MSG_TITLE (_("No MIDI")),
- SFI_MSG_TEXT1 (_("MIDI input or oputput is not available.")),
- SFI_MSG_TEXT2 (_("No available MIDI device could be found and opened successfully. "
- "Reverting to null device, no MIDI events will be received or sent.")),
- SFI_MSG_TEXT3 (_("Failed to open MIDI devices: %s"), bse_error_blurb (error)),
- SFI_MSG_CHECK (_("Show messages about MIDI device selections problems")));
+ sfi_msg_display (SFI_MSG_WARNING,
+ SFI_MSG_TITLE (_("No MIDI")),
+ SFI_MSG_TEXT1 (_("MIDI input or oputput is not available.")),
+ SFI_MSG_TEXT2 (_("No available MIDI device could be found and opened successfully. "
+ "Reverting to null device, no MIDI events will be received or sent.")),
+ SFI_MSG_TEXT3 (_("Failed to open MIDI devices: %s"), bse_error_blurb (error)),
+ SFI_MSG_CHECK (_("Show messages about MIDI device selections problems")));
}
return server->midi_device ? BSE_ERROR_NONE : error;
}
@@ -582,13 +582,13 @@
error = bse_pcm_writer_open (self->pcm_writer, self->wave_file, 2, bse_engine_sample_freq ());
if (error)
{
- sfi_msg_log (SFI_MSG_ERROR,
- SFI_MSG_TITLE (_("Start Disk Recording")),
- SFI_MSG_TEXT1 (_("Failed to start recording to disk.")),
- SFI_MSG_TEXT2 (_("An error occoured while opening the recording file, selecting a different "
- "file might fix this situation.")),
- SFI_MSG_TEXT3 (_("Failed to open file \"%s\" for output: %s"), self->wave_file, bse_error_blurb (error)),
- SFI_MSG_CHECK (_("Show recording file errors")));
+ sfi_msg_display (SFI_MSG_ERROR,
+ SFI_MSG_TITLE (_("Start Disk Recording")),
+ SFI_MSG_TEXT1 (_("Failed to start recording to disk.")),
+ SFI_MSG_TEXT2 (_("An error occoured while opening the recording file, selecting a different "
+ "file might fix this situation.")),
+ SFI_MSG_TEXT3 (_("Failed to open file \"%s\" for output: %s"), self->wave_file, bse_error_blurb (error)),
+ SFI_MSG_CHECK (_("Show recording file errors")));
g_object_unref (self->pcm_writer);
self->pcm_writer = NULL;
}
@@ -760,17 +760,7 @@
g_return_if_fail (umsg != NULL);
g_signal_emit (self, signal_message, 0, umsg);
if (self->log_messages)
- {
- SfiMessage lmsg = { 0, };
- lmsg.log_domain = umsg->log_domain;
- lmsg.type = umsg->type;
- lmsg.title = umsg->title;
- lmsg.primary = umsg->primary;
- lmsg.secondary = umsg->secondary;
- lmsg.details = umsg->details;
- lmsg.config_check = umsg->config_check;
- sfi_msg_default_handler (&lmsg);
- }
+ bse_message_to_default_handler (umsg);
}
void
Modified: trunk/bse/gsldatacache.c
===================================================================
--- trunk/bse/gsldatacache.c 2006-11-21 00:19:43 UTC (rev 4088)
+++ trunk/bse/gsldatacache.c 2006-11-21 00:20:26 UTC (rev 4089)
@@ -80,7 +80,7 @@
g_assert (initialized == FALSE);
initialized++;
- g_static_assert (AGE_EPSILON < LOW_PERSISTENCY_RESIDENT_SET);
+ BIRNET_STATIC_ASSERT (AGE_EPSILON < LOW_PERSISTENCY_RESIDENT_SET);
sfi_cond_init (&global_dcache_cond_node_filled);
sfi_mutex_init (&global_dcache_mutex);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
