1
0
Fork 0

Merge pull request #1943 from H3rnand3zzz/gmainloop

Use Gmainloop as a main loop to increase performance
This commit is contained in:
Michael Vetter 2024-01-16 12:18:34 +01:00 committed by GitHub
commit 609fde0998
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 78 additions and 29 deletions

View File

@ -130,6 +130,7 @@ unittest_sources = \
tests/unittests/xmpp/stub_xmpp.c \
tests/unittests/xmpp/stub_message.c \
tests/unittests/ui/stub_ui.c tests/unittests/ui/stub_ui.h \
tests/unittests/ui/stub_inputwin.c tests/unittests/ui/stub_inputwin.h \
tests/unittests/ui/stub_vcardwin.c \
tests/unittests/log/stub_log.c \
tests/unittests/chatlog/stub_chatlog.c \

View File

@ -43,6 +43,7 @@
#include <signal.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <glib.h>
@ -60,6 +61,7 @@
#include "command/cmd_defs.h"
#include "plugins/plugins.h"
#include "event/client_events.h"
#include "ui/inputwin.h"
#include "ui/ui.h"
#include "ui/window_list.h"
#include "xmpp/resource.h"
@ -86,15 +88,15 @@
static void _init(char* log_level, char* config_file, char* log_file, char* theme_name);
static void _shutdown(void);
static void _connect_default(const char* const account);
static gboolean _main_update(gpointer data);
pthread_mutex_t lock;
static gboolean force_quit = FALSE;
GMainLoop* mainloop = NULL;
void
prof_run(char* log_level, char* account_name, char* config_file, char* log_file, char* theme_name)
{
gboolean cont = TRUE;
_init(log_level, config_file, log_file, theme_name);
plugins_on_start();
_connect_default(account_name);
@ -105,33 +107,10 @@ prof_run(char* log_level, char* account_name, char* config_file, char* log_file,
session_init_activity();
char* line = NULL;
while (cont && !force_quit) {
log_stderr_handler();
session_check_autoaway();
line = inp_readline();
if (line) {
ProfWin* window = wins_get_current();
cont = cmd_process_input(window, line);
free(line);
line = NULL;
} else {
cont = TRUE;
}
#ifdef HAVE_LIBOTR
otr_poll();
#endif
plugins_run_timed();
notify_remind();
session_process_events();
iq_autoping_check();
ui_update();
#ifdef HAVE_GTK
tray_update();
#endif
}
mainloop = g_main_loop_new(NULL, TRUE);
g_timeout_add(1000 / 60, _main_update, NULL);
inp_add_watch();
g_main_loop_run(mainloop);
}
void
@ -140,6 +119,29 @@ prof_set_quit(void)
force_quit = TRUE;
}
static gboolean
_main_update(gpointer data)
{
log_stderr_handler();
session_check_autoaway();
#ifdef HAVE_LIBOTR
otr_poll();
#endif
plugins_run_timed();
notify_remind();
session_process_events();
iq_autoping_check();
ui_update();
chat_state_idle();
#ifdef HAVE_GTK
tray_update();
#endif
// Always repeat
return TRUE;
}
static void
_connect_default(const char* const account)
{

View File

@ -44,5 +44,6 @@ void prof_run(char* log_level, char* account_name, char* config_file, char* log_
void prof_set_quit(void);
extern pthread_mutex_t lock;
extern GMainLoop* mainloop;
#endif

View File

@ -171,6 +171,45 @@ create_input_window(void)
_inp_win_update_virtual();
}
static gboolean
_inp_callback(GIOChannel* source, GIOCondition condition, gpointer data)
{
rl_callback_read_char();
if (rl_line_buffer && rl_line_buffer[0] != '/' && rl_line_buffer[0] != '\0' && rl_line_buffer[0] != '\n') {
chat_state_activity();
}
ui_reset_idle_time();
if (!get_password) {
// Update the input buffer on screen
_inp_write(rl_line_buffer, rl_point);
}
if (inp_line) {
ProfWin* window = wins_get_current();
if (!cmd_process_input(window, inp_line))
g_main_loop_quit(mainloop);
free(inp_line);
inp_line = NULL;
}
return TRUE;
}
void
inp_add_watch(void)
{
GIOChannel* channel = g_io_channel_unix_new(fileno(rl_instream));
if (g_io_channel_set_encoding(channel, NULL, NULL) != G_IO_STATUS_NORMAL) {
log_error("cannot set NULL encoding");
}
g_io_add_watch(channel, G_IO_IN, _inp_callback, NULL);
}
char*
inp_readline(void)
{

View File

@ -46,5 +46,6 @@ void inp_win_resize(void);
void inp_put_back(void);
char* inp_get_password(void);
char* inp_get_line(void);
void inp_add_watch(void);
#endif

View File

@ -0,0 +1,4 @@
void
inp_add_watch(void)
{
}

View File

@ -0,0 +1 @@
void inp_add_watch(void);