[Olsr-dev] [PATCH v1 00/43] More cleanups

Ferry Huberts (spam-protected)
Wed Nov 11 19:05:28 CET 2015


git-send-email is refusing to send patch 42/43

I've pushed the branch 'cleanup'

On 11/11/15 17:21, Ferry Huberts wrote:
> From: Ferry Huberts <(spam-protected)>
>
> More cleanups towards further cleaning up the shutdown path.
>
> Ferry Huberts (43):
>    httpinfo: remove unused copyright_string
>    conf: remove unused copyright_string
>    main: remove unused copyright_string
>    main: remove pointless type size asserts
>    main: make sure all variables are initialised
>    main: move some initialisation to the beginning of main
>    main: always store argv
>    random: remove pointless olsr_init_random, only invoked in main
>    conf: fix determining the lock file, mirror what main does
>    main: no need to re-determine lock_file; already setup by
>      set_derived_cnf
>    main: use olsr_cnf->lock_file directly
>    lock_file: move olsrd_get_default_lockfile into its own file
>    main: move olsr_create_lock_file into its own file
>    lock_file: add olsr_remove_lock_file function
>    main: remove the lock file in olsr_shutdown
>    main: move printing of version into a function
>    main: move loading the config into the loadConfig function
>    main: minor improvements to loadConfig
>    main: initialise timers after processing the configuration
>    main: process olsrd options in a block
>    main: minor improvements
>    conf: remove an unneeded printf
>    conf: move loadConfig function here from main
>    pid: move pid file handling into its own file
>    main: move lock file creation into the lock_file file
>    main: move conf_file_name variable into cfgparser
>    main: limit the scope of 2 variables to where they are needed
>    main: invoke olsr_exit at the end of main
>    main: minor update
>    main: initialise IPC a bit earlier
>    main: call olsr_exit when writing the PID file fails
>    main: minor update
>    link_set: make sure link_changes is initialised
>    main: minor update
>    main: call olsr_exit in olsr_reconfigure
>    main: track the heartbeat timer
>    main: stop the heartbeat timer during shutdown
>    pid_file: add removePidFile function
>    log: add olsr_closelog function
>    main: close the log in olsr_shutdown
>    main: stop the scheduler in olsr_shutdown
>    main: move CLI related function into their own file
>    main: move some functions around
>
>   lib/httpinfo/src/olsrd_httpinfo.c                 |    3 -
>   src/cfgparser/Makefile                            |    2 +-
>   src/cfgparser/cfgfile_gen.c                       |    1 +
>   src/cfgparser/olsrd_conf.c                        |  113 +-
>   src/cfgparser/olsrd_conf.h                        |    4 +-
>   src/cli.c                                         |  383 +++++++
>   src/{mpr.h => cli.h}                              |   28 +-
>   src/defs.h                                        |    5 -
>   src/link_set.c                                    |    2 +-
>   src/lock_file.c                                   |  184 +++
>   src/{lq_mpr.h => lock_file.h}                     |   24 +-
>   src/log.h                                         |    2 +
>   src/main.c                                        | 1245 ++++++---------------
>   src/olsr_random.h                                 |    4 -
>   lib/watchdog/src/olsrd_plugin.h => src/pid_file.c |   85 +-
>   src/{misc.h => pid_file.h}                        |   20 +-
>   src/scheduler.c                                   |   48 +-
>   src/scheduler.h                                   |    1 +
>   src/unix/log.c                                    |    8 +
>   src/win32/log.c                                   |    3 +
>   20 files changed, 1148 insertions(+), 1017 deletions(-)
>   create mode 100644 src/cli.c
>   copy src/{mpr.h => cli.h} (84%)
>   create mode 100644 src/lock_file.c
>   copy src/{lq_mpr.h => lock_file.h} (85%)
>   copy lib/watchdog/src/olsrd_plugin.h => src/pid_file.c (53%)
>   copy src/{misc.h => pid_file.h} (88%)
>

-- 
Ferry Huberts



More information about the Olsr-dev mailing list