MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-06-18 09:58:22 +02:00
Code Issues Releases Wiki Activity

cache: rough conversion of help system to std::map (ref #202)

Browse source
This commit is contained in:
William Pitcock 2016-07-30 22:13:29 -05:00
parent d18e5dc54f
commit 1c813cee95
4 changed files with 28 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
include/ircd/cache.h
View file

@ -1,5 +1,8 @@
#ifndef INCLUDED_CACHE_H
#define INCLUDED_CACHE_H
#include <map>
#include "ircd/util.h"
#pragma once
#define HAVE_IRCD_CACHE_H
#define HELP_MAX 100
@ -10,8 +13,6 @@
#define HELP_USER 0x001
#define HELP_OPER 0x002
struct Client;
struct cachefile
{
char name[CACHEFILELEN];
@ -25,13 +26,6 @@ struct cacheline
rb_dlink_node linenode;
};
extern struct cachefile *user_motd;
extern struct cachefile *oper_motd;
extern struct cacheline *emptyline;
extern char user_motd_changed[MAX_DATE_STRING];
extern rb_dlink_list links_cache_list;
void init_cache(void);
struct cachefile *cache_file(const char *, const char *, int);
void cache_links(void *unused);
@ -43,7 +37,12 @@ void send_user_motd(struct Client *);
void send_oper_motd(struct Client *);
void cache_user_motd(void);
extern rb_dictionary *help_dict_oper;
extern rb_dictionary *help_dict_user;
extern struct cachefile *user_motd;
extern struct cachefile *oper_motd;
extern struct cacheline *emptyline;
#endif
extern char user_motd_changed[MAX_DATE_STRING];
extern rb_dlink_list links_cache_list;
extern std::map<std::string, cachefile *, case_insensitive_less> help_dict_oper;
extern std::map<std::string, cachefile *, case_insensitive_less> help_dict_user;

1
include/ircd/hash.h
View file

@ -62,7 +62,6 @@ extern rb_radixtree *channel_tree;
struct Client;
struct Channel;
struct ConfItem;
struct cachefile;
struct nd_entry;
extern uint32_t fnv_hash_upper(const unsigned char *s, int bits);

29
ircd/cache.cc
View file

@ -38,14 +38,16 @@
#include <ircd/numeric.h>
#include <ircd/send.h>
#include <map>
struct cachefile *user_motd = NULL;
struct cachefile *oper_motd = NULL;
struct cacheline *emptyline = NULL;
rb_dlink_list links_cache_list;
char user_motd_changed[MAX_DATE_STRING];
rb_dictionary *help_dict_oper = NULL;
rb_dictionary *help_dict_user = NULL;
std::map<std::string, cachefile *, case_insensitive_less> help_dict_oper;
std::map<std::string, cachefile *, case_insensitive_less> help_dict_user;
/* init_cache()
*
@ -65,9 +67,6 @@ init_cache(void)
user_motd = cache_file(fs::paths[IRCD_PATH_IRCD_MOTD], "ircd.motd", 0);
oper_motd = cache_file(fs::paths[IRCD_PATH_IRCD_OMOTD], "opers.motd", 0);
memset(&links_cache_list, 0, sizeof(links_cache_list));
help_dict_oper = rb_dictionary_create("oper help", reinterpret_cast<int (*)(const void *, const void *)>(rb_strcasecmp));
help_dict_user = rb_dictionary_create("user help", reinterpret_cast<int (*)(const void *, const void *)>(rb_strcasecmp));
}
/*
@ -241,17 +240,17 @@ load_help(void)
#endif
void *elem;
RB_DICTIONARY_FOREACH(elem, &iter, help_dict_oper)
for (auto it = help_dict_oper.begin(); it != help_dict_oper.end(); it++)
{
const auto cacheptr(reinterpret_cast<cachefile *>(elem));
rb_dictionary_delete(help_dict_oper, cacheptr->name);
free_cachefile(cacheptr);
free_cachefile(it->second);
help_dict_oper.erase(it);
}
RB_DICTIONARY_FOREACH(elem, &iter, help_dict_user)
for (auto it = help_dict_user.begin(); it != help_dict_user.end(); it++)
{
const auto cacheptr(reinterpret_cast<cachefile *>(elem));
rb_dictionary_delete(help_dict_user, cacheptr->name);
free_cachefile(cacheptr);
free_cachefile(it->second);
help_dict_oper.erase(it);
}
helpfile_dir = opendir(fs::paths[IRCD_PATH_OPERHELP]);
@ -265,7 +264,7 @@ load_help(void)
continue;
snprintf(filename, sizeof(filename), "%s%c%s", fs::paths[IRCD_PATH_OPERHELP], RB_PATH_SEPARATOR, ldirent->d_name);
cacheptr = cache_file(filename, ldirent->d_name, HELP_OPER);
rb_dictionary_add(help_dict_oper, cacheptr->name, cacheptr);
help_dict_oper[cacheptr->name] = cacheptr;
}
closedir(helpfile_dir);
@ -300,7 +299,7 @@ load_help(void)
#endif
cacheptr = cache_file(filename, ldirent->d_name, HELP_USER);
rb_dictionary_add(help_dict_user, cacheptr->name, cacheptr);
help_dict_user[cacheptr->name] = cacheptr;
}
closedir(helpfile_dir);

2
modules/m_help.cc
View file

@ -96,7 +96,7 @@ dohelp(struct Client *source_p, int flags, const char *topic)
if(EmptyString(topic))
topic = ntopic;
hptr = (cachefile *)rb_dictionary_retrieve(flags & HELP_OPER ? help_dict_oper : help_dict_user, topic);
hptr = flags & HELP_OPER ? help_dict_oper[topic] : help_dict_user[topic];
if(hptr == NULL || !(hptr->flags & flags))
{