Skip to content

Commit

Permalink
zwischenstand
Browse files Browse the repository at this point in the history
  • Loading branch information
@pstorz
pstorz committed Dec 20, 2017
1 parent 88714fd commit 3bb62e2
Show file tree
Hide file tree
Showing 30 changed files with 484 additions and 467 deletions.
34 changes: 13 additions & 21 deletions src/cats/CMakeLists.txt
View file
Expand Up @@ -27,11 +27,9 @@ set(LIBBAREOSSQL_SRCS
bvfs.cc cats.cc sql.cc sql_create.cc sql_delete.cc sql_find.cc
sql_get.cc sql_list.cc sql_pooling.cc sql_query.cc sql_update.cc
)


set(LIBBAREOSCATS_DYN_SRCS cats_backends.cc)


set(LIBBAREOSCATS_SRCS
cats_backends.cc
)

set(SQLITE_SRCS sqlite.cc)

Expand All @@ -45,6 +43,7 @@ add_library(bareossql SHARED ${LIBBAREOSSQL_SRCS})
set_target_properties(bareossql PROPERTIES VERSION "${VERSION}"
SOVERSION "${SOVERSION}"
)
target_link_libraries (bareossql bareoscats bareos)


# TODO: install default db backend
Expand All @@ -55,23 +54,16 @@ set_target_properties(bareossql PROPERTIES VERSION "${VERSION}"
list(LENGTH db_backends nr_db_backends)


#IF(${nr_db_backends} EQUAL 1)
# ADD_CUSTOM_COMMAND(
# OUTPUT ${bindir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX} ALL
# COMMENT "Only one db backend (${default_db_backend}) available, creating symlink"
# COMMAND ${CMAKE_COMMAND} -E create_symlink ${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX}
# ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX})
#ELSE()
add_library(bareoscats SHARED ${LIBBAREOSCATS_SRCS} ${LIBBAREOSCATS_DYN_SRCS})
target_link_libraries (bareoscats bareossql bareos)
set_target_properties(bareoscats PROPERTIES
VERSION ${VERSION}
SOVERSION "${SOVERSION}"
)
INSTALL(TARGETS bareoscats
DESTINATION ${libdir})

#ENDIF()
add_library(bareoscats SHARED ${LIBBAREOSCATS_SRCS})
target_link_libraries (bareoscats bareos)
set_target_properties(bareoscats PROPERTIES
VERSION ${VERSION}
SOVERSION "${SOVERSION}"
)
INSTALL(TARGETS bareoscats
DESTINATION ${libdir})


IF (HAVE_SQLITE3)
add_library(bareoscats-sqlite3 MODULE ${SQLITE_SRCS})
Expand Down
29 changes: 15 additions & 14 deletions src/cats/protos.h
View file
Expand Up @@ -30,14 +30,15 @@

#include "cats.h"


/* Database prototypes */

/* cats_backends.c */
#if defined(HAVE_DYNAMIC_CATS_BACKENDS)
void db_set_backend_dirs(alist *new_backend_dirs);
DLL_IMP_EXP void db_set_backend_dirs(alist *new_backend_dirs);
#endif
void db_flush_backends(void);
B_DB *db_init_database(JCR *jcr,
DLL_IMP_EXP void db_flush_backends(void);
DLL_IMP_EXP B_DB *db_init_database(JCR *jcr,
const char *db_driver,
const char *db_name,
const char *db_user,
Expand All @@ -52,14 +53,14 @@ B_DB *db_init_database(JCR *jcr,
bool need_private = false);

/* sql.c */
int db_int64_handler(void *ctx, int num_fields, char **row);
int db_strtime_handler(void *ctx, int num_fields, char **row);
int db_list_handler(void *ctx, int num_fields, char **row);
void db_debug_print(JCR *jcr, FILE *fp);
int db_int_handler(void *ctx, int num_fields, char **row);
DLL_IMP_EXP int db_int64_handler(void *ctx, int num_fields, char **row);
DLL_IMP_EXP int db_strtime_handler(void *ctx, int num_fields, char **row);
DLL_IMP_EXP int db_list_handler(void *ctx, int num_fields, char **row);
DLL_IMP_EXP void db_debug_print(JCR *jcr, FILE *fp);
DLL_IMP_EXP int db_int_handler(void *ctx, int num_fields, char **row);

/* sql_pooling.c */
bool db_sql_pool_initialize(const char *db_drivername,
DLL_IMP_EXP bool db_sql_pool_initialize(const char *db_drivername,
const char *db_name,
const char *db_user,
const char *db_password,
Expand All @@ -74,9 +75,9 @@ bool db_sql_pool_initialize(const char *db_drivername,
int increment_connections,
int idle_timeout,
int validate_timeout);
void db_sql_pool_destroy(void);
void db_sql_pool_flush(void);
B_DB *db_sql_get_non_pooled_connection(JCR *jcr,
DLL_IMP_EXP void db_sql_pool_destroy(void);
DLL_IMP_EXP void db_sql_pool_flush(void);
DLL_IMP_EXP B_DB *db_sql_get_non_pooled_connection(JCR *jcr,
const char *db_drivername,
const char *db_name,
const char *db_user,
Expand All @@ -89,7 +90,7 @@ B_DB *db_sql_get_non_pooled_connection(JCR *jcr,
bool try_reconnect,
bool exit_on_fatal,
bool need_private = false);
B_DB *db_sql_get_pooled_connection(JCR *jcr,
DLL_IMP_EXP B_DB *db_sql_get_pooled_connection(JCR *jcr,
const char *db_drivername,
const char *db_name,
const char *db_user,
Expand All @@ -102,7 +103,7 @@ B_DB *db_sql_get_pooled_connection(JCR *jcr,
bool try_reconnect,
bool exit_on_fatal,
bool need_private = false);
void db_sql_close_pooled_connection(JCR *jcr, B_DB *mdb, bool abort = false);
DLL_IMP_EXP void db_sql_close_pooled_connection(JCR *jcr, B_DB *mdb, bool abort = false);

/* sql_query.c */
#endif /* __SQL_PROTOS_H */
1 change: 1 addition & 0 deletions src/findlib/CMakeLists.txt
View file
Expand Up @@ -39,6 +39,7 @@ INSTALL(TARGETS bareosfind DESTINATION ${libdir})
set_target_properties(bareosfind PROPERTIES VERSION "${VERSION}"
SOVERSION "${SOVERSION}"
DEFINE_SYMBOL "BUILDING_DLL"
LINK_FLAGS -Wl,--output-def,bareosfind.def -L bareos.def
)

add_subdirectory(unittests)
2 changes: 1 addition & 1 deletion src/findlib/find.h
View file
Expand Up @@ -66,7 +66,7 @@ struct utimbuf {
#endif
#ifdef USE_READDIR_R
#ifndef HAVE_READDIR_R
int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result);
DLL_IMP_EXP int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result);
#endif
#endif
/**
Expand Down
6 changes: 3 additions & 3 deletions src/findlib/protos.h
View file
Expand Up @@ -94,11 +94,11 @@ bool makepath(ATTR *attr, const char *path, mode_t mode,
bool keep_dir_modes);

/* fstype.c */
bool fstype(const char *fname, char *fs, int fslen);
bool fstype_equals(const char *fname, const char *fstypename);
DLL_IMP_EXP bool fstype(const char *fname, char *fs, int fslen);
DLL_IMP_EXP bool fstype_equals(const char *fname, const char *fstypename);

/* drivetype.c */
bool drivetype(const char *fname, char *fs, int fslen);
DLL_IMP_EXP bool drivetype(const char *fname, char *fs, int fslen);

/* shadowing.c */
void check_include_list_shadowing(JCR *jcr, findFILESET *fileset);
Expand Down
20 changes: 10 additions & 10 deletions src/include/baconfig.h
View file
Expand Up @@ -559,18 +559,18 @@ m_msg(__FILE__, __LINE__, buf, msg, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11

class POOL_MEM;
/* Edit message into Pool Memory buffer -- no __FILE__ and __LINE__ */
int Mmsg(POOLMEM *&msgbuf, const char *fmt, ...);
int Mmsg(POOL_MEM &msgbuf, const char *fmt, ...);
int Mmsg(POOL_MEM *&msgbuf, const char *fmt, ...);
DLL_IMP_EXP int Mmsg(POOLMEM *&msgbuf, const char *fmt, ...);
DLL_IMP_EXP int Mmsg(POOL_MEM &msgbuf, const char *fmt, ...);
DLL_IMP_EXP int Mmsg(POOL_MEM *&msgbuf, const char *fmt, ...);

class JCR;
void d_msg(const char *file, int line, int level, const char *fmt, ...);
void p_msg(const char *file, int line, int level, const char *fmt, ...);
void p_msg_fb(const char *file, int line, int level, const char *fmt,...);
void e_msg(const char *file, int line, int type, int level, const char *fmt, ...);
void j_msg(const char *file, int line, JCR *jcr, int type, utime_t mtime, const char *fmt, ...);
void q_msg(const char *file, int line, JCR *jcr, int type, utime_t mtime, const char *fmt, ...);
int m_msg(const char *file, int line, POOLMEM *&pool_buf, const char *fmt, ...);
DLL_IMP_EXP void d_msg(const char *file, int line, int level, const char *fmt, ...);
DLL_IMP_EXP void p_msg(const char *file, int line, int level, const char *fmt, ...);
DLL_IMP_EXP void p_msg_fb(const char *file, int line, int level, const char *fmt,...);
DLL_IMP_EXP void e_msg(const char *file, int line, int type, int level, const char *fmt, ...);
DLL_IMP_EXP void j_msg(const char *file, int line, JCR *jcr, int type, utime_t mtime, const char *fmt, ...);
DLL_IMP_EXP void q_msg(const char *file, int line, JCR *jcr, int type, utime_t mtime, const char *fmt, ...);
DLL_IMP_EXP int m_msg(const char *file, int line, POOLMEM *&pool_buf, const char *fmt, ...);

/** Use our strdup with smartalloc */
#undef strdup
Expand Down
20 changes: 10 additions & 10 deletions src/include/jcr.h
View file
Expand Up @@ -638,16 +638,16 @@ extern DLL_IMP_EXP dlist *last_jobs;
/*
* The following routines are found in lib/jcr.c
*/
extern int get_next_jobid_from_list(char **p, uint32_t *JobId);
extern bool init_jcr_subsystem(int timeout);
extern JCR *new_jcr(int size, JCR_free_HANDLER *daemon_free_jcr);
extern JCR *get_jcr_by_id(uint32_t JobId);
extern JCR *get_jcr_by_session(uint32_t SessionId, uint32_t SessionTime);
extern JCR *get_jcr_by_partial_name(char *Job);
extern JCR *get_jcr_by_full_name(char *Job);
extern JCR *get_next_jcr(JCR *jcr);
extern void set_jcr_job_status(JCR *jcr, int JobStatus);
extern int DLL_IMP_EXP num_jobs_run;
DLL_IMP_EXP extern int get_next_jobid_from_list(char **p, uint32_t *JobId);
DLL_IMP_EXP extern bool init_jcr_subsystem(int timeout);
DLL_IMP_EXP extern JCR *new_jcr(int size, JCR_free_HANDLER *daemon_free_jcr);
DLL_IMP_EXP extern JCR *get_jcr_by_id(uint32_t JobId);
DLL_IMP_EXP extern JCR *get_jcr_by_session(uint32_t SessionId, uint32_t SessionTime);
DLL_IMP_EXP extern JCR *get_jcr_by_partial_name(char *Job);
DLL_IMP_EXP extern JCR *get_jcr_by_full_name(char *Job);
DLL_IMP_EXP extern JCR *get_next_jcr(JCR *jcr);
DLL_IMP_EXP extern void set_jcr_job_status(JCR *jcr, int JobStatus);
DLL_IMP_EXP extern int DLL_IMP_EXP num_jobs_run;

#ifdef DEBUG
extern void b_free_jcr(const char *file, int line, JCR *jcr);
Expand Down
6 changes: 3 additions & 3 deletions src/lib/CMakeLists.txt
View file
Expand Up @@ -79,7 +79,7 @@ set (BAREOSCFG_SRCS ini.cc lex.cc parse_bsr.cc )


add_library(bareoscfg SHARED ${BAREOSCFG_SRCS})
target_link_libraries(bareoscfg ${JANSSON_LIBRARIES})
target_link_libraries(bareoscfg bareos ${JANSSON_LIBRARIES})

set (BAREOS_STATIC_SRCS parse_conf.cc res.cc)
add_library(bareosstatic STATIC ${BAREOS_STATIC_SRCS})
Expand All @@ -91,14 +91,14 @@ INSTALL(TARGETS bareoscfg DESTINATION ${libdir})
set_target_properties(bareoscfg PROPERTIES VERSION "${VERSION}"
SOVERSION "${SOVERSION}"
DEFINE_SYMBOL "BUILDING_DLL"
LINK_FLAGS -Wl,--output-def,bareoscfg.def
)
#LINK_FLAGS -Wl,--out-implib,bareoscfg.a

set_target_properties(bareos PROPERTIES VERSION "${VERSION}"
SOVERSION "${SOVERSION}"
DEFINE_SYMBOL "BUILDING_DLL"
LINK_FLAGS -Wl,--output-def,bareos.def
)
#LINK_FLAGS -Wl,--out-implib,bareos.a

INSTALL(FILES ${INCLUDE_FILES} DESTINATION ${includedir})

Expand Down
2 changes: 1 addition & 1 deletion src/lib/alist.h
View file
Expand Up @@ -83,7 +83,7 @@ enum {
* Array list -- much like a simplified STL vector
* array of pointers to inserted items
*/
class alist : public SMARTALLOC {
class DLL_IMP_EXP alist : public SMARTALLOC {
void **items;
int num_items;
int max_items;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/berrno.h
View file
Expand Up @@ -51,7 +51,7 @@
* If bit 29 in m_berrno is not set, then it is a Unix errno.
*
*/
class berrno : public SMARTALLOC {
class DLL_IMP_EXP berrno : public SMARTALLOC {
POOLMEM *m_buf;
int m_berrno;
void format_win32_message();
Expand Down
8 changes: 4 additions & 4 deletions src/lib/bregex.h
View file
Expand Up @@ -186,12 +186,12 @@ void re_compile_fastmap(regex_t *compiled);
* to an array of 256 characters. */


int regcomp(regex_t *preg, const char *regex, int cflags);
int regexec(regex_t *preg, const char *string, size_t nmatch,
DLL_IMP_EXP int regcomp(regex_t *preg, const char *regex, int cflags);
DLL_IMP_EXP int regexec(regex_t *preg, const char *string, size_t nmatch,
regmatch_t pmatch[], int eflags);
size_t regerror(int errcode, regex_t *preg, char *errbuf,
DLL_IMP_EXP size_t regerror(int errcode, regex_t *preg, char *errbuf,
size_t errbuf_size);
void regfree(regex_t *preg);
DLL_IMP_EXP void regfree(regex_t *preg);

#endif /* REGEXPR_H */

Expand Down
30 changes: 15 additions & 15 deletions src/lib/btime.h
View file
Expand Up @@ -23,21 +23,21 @@
#define __btime_INCLUDED

/* New btime definition -- use this */
btime_t get_current_btime(void);
time_t btime_to_unix(btime_t bt); /* bareos time to epoch time */
utime_t btime_to_utime(btime_t bt); /* bareos time to utime_t */

int tm_wom(int mday, int wday);
int tm_woy(time_t stime);

void blocaltime(const time_t *time, struct tm *tm);
char *bstrutime(char *dt, int maxlen, utime_t tim);
char *bstrftime(char *dt, int maxlen, utime_t tim, const char *fmt = NULL);
char *bstrftimes(char *dt, int maxlen, utime_t tim);
char *bstrftime_ny(char *dt, int maxlen, utime_t tim);
char *bstrftime_nc(char *dt, int maxlen, utime_t tim);
char *bstrftime_wd(char *dt, int maxlen, utime_t tim);
utime_t str_to_utime(const char *str);
DLL_IMP_EXP btime_t get_current_btime(void);
DLL_IMP_EXP time_t btime_to_unix(btime_t bt); /* bareos time to epoch time */
DLL_IMP_EXP utime_t btime_to_utime(btime_t bt); /* bareos time to utime_t */

DLL_IMP_EXP int tm_wom(int mday, int wday);
DLL_IMP_EXP int tm_woy(time_t stime);

DLL_IMP_EXP void blocaltime(const time_t *time, struct tm *tm);
DLL_IMP_EXP char *bstrutime(char *dt, int maxlen, utime_t tim);
DLL_IMP_EXP char *bstrftime(char *dt, int maxlen, utime_t tim, const char *fmt = NULL);
DLL_IMP_EXP char *bstrftimes(char *dt, int maxlen, utime_t tim);
DLL_IMP_EXP char *bstrftime_ny(char *dt, int maxlen, utime_t tim);
DLL_IMP_EXP char *bstrftime_nc(char *dt, int maxlen, utime_t tim);
DLL_IMP_EXP char *bstrftime_wd(char *dt, int maxlen, utime_t tim);
DLL_IMP_EXP utime_t str_to_utime(const char *str);


/* =========================================================== */
Expand Down
3 changes: 1 addition & 2 deletions src/lib/cbuf.h
View file
Expand Up @@ -29,8 +29,7 @@

#define QSIZE 10 /**< # of pointers in the queue */

class circbuf : public SMARTALLOC {
private:
class DLL_IMP_EXP circbuf : public SMARTALLOC {
int m_size;
int m_next_in;
int m_next_out;
Expand Down
18 changes: 9 additions & 9 deletions src/lib/crypto_cache.h
View file
Expand Up @@ -45,14 +45,14 @@ struct crypto_cache_entry_t {
utime_t added;
};

void read_crypto_cache(const char *dir, const char *progname, int port);
void read_crypto_cache(const char *cache_file);
void write_crypto_cache(const char *dir, const char *progname, int port);
void write_crypto_cache(const char *cache_file);
bool update_crypto_cache(const char *VolumeName, const char *EncryptionKey);
char *lookup_crypto_cache_entry(const char *VolumeName);
void dump_crypto_cache(int fd);
void reset_crypto_cache(void);
void flush_crypto_cache(void);
DLL_IMP_EXP void read_crypto_cache(const char *dir, const char *progname, int port);
DLL_IMP_EXP void read_crypto_cache(const char *cache_file);
DLL_IMP_EXP void write_crypto_cache(const char *dir, const char *progname, int port);
DLL_IMP_EXP void write_crypto_cache(const char *cache_file);
DLL_IMP_EXP bool update_crypto_cache(const char *VolumeName, const char *EncryptionKey);
DLL_IMP_EXP char *lookup_crypto_cache_entry(const char *VolumeName);
DLL_IMP_EXP void dump_crypto_cache(int fd);
DLL_IMP_EXP void reset_crypto_cache(void);
DLL_IMP_EXP void flush_crypto_cache(void);

#endif /* _CRYPTO_CACHE_H */
6 changes: 3 additions & 3 deletions src/lib/dlist.h
View file
Expand Up @@ -54,7 +54,7 @@ struct dlink {
void *prev;
};

class dlist : public SMARTALLOC {
class DLL_IMP_EXP dlist : public SMARTALLOC {
void *head;
void *tail;
int16_t loffset;
Expand Down Expand Up @@ -199,5 +199,5 @@ class dlistString
*/
};

extern dlistString *new_dlistString(const char *str, int len);
extern dlistString *new_dlistString(const char *str);
DLL_IMP_EXP extern dlistString *new_dlistString(const char *str, int len);
DLL_IMP_EXP extern dlistString *new_dlistString(const char *str);
2 changes: 1 addition & 1 deletion src/lib/fnmatch.h
View file
Expand Up @@ -50,6 +50,6 @@
#define FNM_IGNORECASE FNM_CASEFOLD
#define FNM_FILE_NAME FNM_PATHNAME

extern "C" int fnmatch(const char *, const char *, int);
extern "C" DLL_IMP_EXP int fnmatch(const char *, const char *, int);

#endif /* !_FNMATCH_H_ */
2 changes: 1 addition & 1 deletion src/lib/htable.h
View file
Expand Up @@ -74,7 +74,7 @@ struct h_mem {
char first[1]; /* First byte */
};

class htable : public SMARTALLOC {
class DLL_IMP_EXP htable : public SMARTALLOC {
hlink **table; /* Hash table */
int loffset; /* Link offset in item */
hlink *walkptr; /* Table walk pointer */
Expand Down
4 changes: 2 additions & 2 deletions src/lib/lockmgr.h
View file
Expand Up @@ -27,8 +27,8 @@
/*
* P and V op that don't use the lock manager (for memory allocation or on win32)
*/
void lmgr_p(pthread_mutex_t *m);
void lmgr_v(pthread_mutex_t *m);
DLL_IMP_EXP void lmgr_p(pthread_mutex_t *m);
DLL_IMP_EXP void lmgr_v(pthread_mutex_t *m);

#ifdef _USE_LOCKMGR

Expand Down

0 comments on commit 3bb62e2

Please sign in to comment.