Merge branch 'master' into dev-sizet

[libucw.git] / ucw / doc / conf.txt

diff --git a/ucw/doc/conf.txt b/ucw/doc/conf.txt
index 5f9a88ccc4491f50f8d0185ddd4ccbfa1341854f..777dbe10facca83e30255028803bca7296a2a71b 100644 (file)
--- a/ucw/doc/conf.txt
+++ b/ucw/doc/conf.txt
@@ -1,55 +1,53 @@
-Configuration and command line parser
-=====================================
+Configuration parser
+====================

 
 

-Libucw contains a parser for configuration files described in
-<<config:>>.
+Libucw contains a parser for configuration files. The syntax of the
+configuration files is described in <<config:>>, here we explain the
+interface of the parser.

 
 

-The principle is you specify the structure of the configuration file,
-the section names, variable names and types and your C variables that
-are assigned to them. Then you run the parser and it fills your
-variables with the values from the configuration file.
+Basically, you write a description of the configuration file syntax,
+which maps configuration items to variables of your program. Then
+Then you run the parser and it fills your variables with the values
+from the configuration file.

 
 

-It is modular. It means you do not have to write all configuration at
-the same place, you just declare the parts you need locally and do not
-care about the other parts.
-
-The command line parser has the same interface as unix getopt_long(),
-but handles setting of configuration files and configuration values
-from command line.
+The descriptions are modular. The configuration can be split to sections,
+each section declared at a separate place. You can also define your own
+data types.

 
 - <<example,Example>>
   * <<ex_structure,The structure>>
 
 - <<example,Example>>
   * <<ex_structure,The structure>>

-  * <<ex_load,Loading>>
+  * <<ex_load,Loading configuration>>

 - <<deep,Getting deeper>>
   * <<conf_multi,Arrays and lists>>
   * <<reload,Reloading configuration>>
   * <<custom_parser,Creating custom parsers>>
   * <<hooks,Hooks>>
 - <<conf_h,ucw/conf.h>>
 - <<deep,Getting deeper>>
   * <<conf_multi,Arrays and lists>>
   * <<reload,Reloading configuration>>
   * <<custom_parser,Creating custom parsers>>
   * <<hooks,Hooks>>
 - <<conf_h,ucw/conf.h>>

+  * <<conf_ctxt,Configuration contexts>>
+  * <<conf_load,Safe configuration loading>>

   * <<conf_types,Data types>>
   * <<conf_macros,Convenience macros>>
   * <<alloc,Memory allocation>>
   * <<journal,Undo journal>>
   * <<declare,Section declaration>>
   * <<bparser,Parsers for basic types>>
   * <<conf_types,Data types>>
   * <<conf_macros,Convenience macros>>
   * <<alloc,Memory allocation>>
   * <<journal,Undo journal>>
   * <<declare,Section declaration>>
   * <<bparser,Parsers for basic types>>

-- <<getopt_h,ucw/getopt.h>>
-  * <<conf_load,Safe configuration loading>>

   * <<conf_direct,Direct access>>
   * <<conf_dump,Debug dumping>>
   * <<conf_direct,Direct access>>
   * <<conf_dump,Debug dumping>>

-  * <<conf_journal,Journaling control>>
-  * <<conf_getopt,Loading by cf_getopt()>>
+- <<getopt_h,ucw/getopt.h>>
+  * <<conf_getopt,Loading configuration by cf_getopt()>> (obsolete)
+  * <<getopt_example,Example>> (obsolete)

 
 [[example]]
 Example
 -------
 If you want to just load simple configuration, this is the part you
 want to read. This simple example should give you the overview. Look
 
 [[example]]
 Example
 -------
 If you want to just load simple configuration, this is the part you
 want to read. This simple example should give you the overview. Look

-into the <<conf_macros,convenience macros>> section to see list of
+at the <<conf_macros,convenience macros>> section to see list of

 supported data types, sections, etc.
 
 [[ex_cfile]]
 supported data types, sections, etc.
 
 [[ex_cfile]]

-Let's say you have configuration file with this content and want to
-load it:
+Suppose you have configuration file with the following content and you
+want to load it:

 
   HelloWorld {
     Text       "Hello planet"
 
   HelloWorld {
     Text       "Hello planet"


@@ -83,54 +81,45 @@ it exists.
   }
 
 The variables are used to store the loaded values. Their initial
   }
 
 The variables are used to store the loaded values. Their initial

-values work as default, if nothing else is loaded. The hw_config()
+values work as defaults, if nothing else is loaded. The hw_config()

 structure assigns the variables to configuration names. The hw_init()
 function (because of the `CONSTRUCTOR` macro) is run before main()
 structure assigns the variables to configuration names. The hw_init()
 function (because of the `CONSTRUCTOR` macro) is run before main()

-is called and it plugs in the whole section to the parser (alternatively,
+is called and it tells the parser that the section exists (alternatively,

 you can call @cf_declare_section() at the start of your main()).
 
 You can plug in as many configuration sections as you like, from
 various places across your code.
 
 [[ex_load]]
 you can call @cf_declare_section() at the start of your main()).
 
 You can plug in as many configuration sections as you like, from
 various places across your code.
 
 [[ex_load]]

-Loading of the values
+Loading configuration

 ~~~~~~~~~~~~~~~~~~~~~
 ~~~~~~~~~~~~~~~~~~~~~

-Suppose you need to parse the command line arguments and load the
-configuration. Then @cf_getopt() is there for you: it works like
-the the traditional @getopt() from the C library, but it also handles
-configuration files.
+You can load the configuration explicitly by calling @cf_load().
+That can be convenient when writing a library, but in normal programs,
+you can ask the <<opt:,option parser>> to handle it for you.

 
 

-  #include <ucw/lib.h>
-  #include <ucw/conf.h>
-  #include <ucw/getopt.h>
+A typical example follows, please see the <<opt:conf,interface between
+conf and opt>> for details.

 
 

-  static byte short_opts[] = CF_SHORT_OPTS "v";
-  static struct option long_opts[] = {
-    CF_LONG_OPTS
-    { "verbose", 0, 0, 'v' },
-    { NULL, 0, 0, 0 }
+  #include <ucw/lib.h>
+  #include <ucw/opt.h>
+  
+  static struct opt_section options = {
+    OPT_ITEMS {
+      // More options can be specified here
+      OPT_HELP("Configuration options:"),
+      OPT_CONF_OPTIONS,
+      OPT_END
+    }

   };
   };

-
-  int verbose;
-
-  int main(int argc, char *argv[]) {
+  
+  int main(int argc, char **argv)
+  {

     cf_def_file = "default.cf";
     cf_def_file = "default.cf";

-    int opt;
-    while((opt = cf_getopt(argc, argv, short_opts, long_opts, NULL)) >= 0)
-      switch(opt) {
-       case 'v': verbose = 1; break;
-       default: fprintf("Unknown option %c\n", opt); return 1;
-      }
+    opt_parse(&options, argv+1);
+    // Configuration file is already loaded here
+    return 0;

   }
 
   }
 

-The `short_opts` and `long_opts` variables describe the command line
-arguments. Notice the `CF_SHORT_OPTS` and `CF_LONG_OPTS` macros. They
-add the `-S` and `-C` options for the configuration parser as described
-in <<config:>>. These options are handled internally by @cf_getopt().
-
-You can rely on the configuration files having been loaded before the
-first of your program's options is parsed.
-

 [[deep]]
 Getting deeper
 --------------
 [[deep]]
 Getting deeper
 --------------


@@ -152,11 +141,11 @@ are three ways to do that:
 +
 For example, you can have an static array of five unsigned integers:
 +
 +
 For example, you can have an static array of five unsigned integers:
 +

-  static uns array = { 1, 2, 3, 4, 5 };
+  static uint array[] = { 1, 2, 3, 4, 5 };

 +
   static struct cf_section section = {
     CF_ITEMS {
 +
   static struct cf_section section = {
     CF_ITEMS {

-      CF_UNS_ARY("array", array, 5),
+      CF_UINT_ARY("array", array, 5),

       CF_END
     }
   };
       CF_END
     }
   };


@@ -164,9 +153,8 @@ For example, you can have an static array of five unsigned integers:
 *Dynamic arrays*::
   Similar to static array, but you provide pointer
   to pointer to the given item (eg. if you want dynamic array of
 *Dynamic arrays*::
   Similar to static array, but you provide pointer
   to pointer to the given item (eg. if you want dynamic array of

-  `int` s, you give `**int`). The parser allocates an array of needed
-  size. You can use the <<def_DARY_LEN,`DARY_LEN`>> macro to find out
-  the number of elements actually loaded.
+  integers, you give `**int`). The parser allocates a <<gary:,growing array>>
+  of the required size.

 +
 If you want dynamic array of strings, you would use:
 +
 +
 If you want dynamic array of strings, you would use:
 +


@@ -180,20 +168,21 @@ If you want dynamic array of strings, you would use:
   };
 
 *Lists*::
   };
 
 *Lists*::

-  Linked lists based on <<clist:>>. You provide description
+  Linked lists based on <<lists:clists,clists>>. You provide description

   of single node and pointer to the
   of single node and pointer to the

-  <<clist:struct_clist,`struct clist`>> variable. All the nodes will
+  <<lists:struct_clist,`struct clist`>> variable. All the nodes will

   be created dynamically and put there.
 +
   be created dynamically and put there.
 +

-First element of your structure must be <<clist:type_cnode,`cnode`>>.
+First element of your structure must be <<lists:struct_cnode,`cnode`>>.

 +
 +

-The first example is list of strings and uses <<clist:simple,simple
+The first example is list of strings and uses <<lists:simple_lists,simple

 lists>>:
 lists>>:

-  struct clist list;
++
+  static struct clist list;

 +
   static struct cf_section section = {
     CF_ITEMS {
 +
   static struct cf_section section = {
     CF_ITEMS {

-      CF_LIST("list", &list, &cf_string_list_cofnig),
+      CF_LIST("list", &list, &cf_string_list_config),

       CF_END
     }
   };
       CF_END
     }
   };


@@ -214,7 +203,7 @@ this variable, `A` will have a value of `10` after a successful load.
 Furthermore, if the loading of a new configuration fails, the current
 configuration is preserved.
 
 Furthermore, if the loading of a new configuration fails, the current
 configuration is preserved.
 

-All this is done with <<journal,config journaling>>. The load of the
+All this is done with <<journal,config journalling>>. The load of the

 first config creates a journal entry. If you try to load some new
 configuration, it is partially rolled back to defaults (the rollback
 happens, but instead of removing the journal entry, another journal
 first config creates a journal entry. If you try to load some new
 configuration, it is partially rolled back to defaults (the rollback
 happens, but instead of removing the journal entry, another journal


@@ -223,7 +212,7 @@ journal entries are removed and a new one, for the new configuration,
 is added. If it fails, the first one is replayed and the rollback
 entry is removed.
 
 is added. If it fails, the first one is replayed and the rollback
 entry is removed.
 

-See <<cf_reload()>>.
+See @cf_reload().

 
 [[custom_parser]]
 Creating custom parsers
 
 [[custom_parser]]
 Creating custom parsers


@@ -233,7 +222,7 @@ If you need to parse some data type the configuration system can't
 handle, you can write your own parser. But before you start, you
 should know a few things.
 
 handle, you can write your own parser. But before you start, you
 should know a few things.
 

-The parser needs to support <<journal,journaling>>. To accomplish that,
+The parser needs to support <<journal,journalling>>. To accomplish that,

 you have to use the <<alloc,configuration mempool>> for memory allocation.
 
 Now, you need a function with the same signature as
 you have to use the <<alloc,configuration mempool>> for memory allocation.
 
 Now, you need a function with the same signature as


@@ -264,8 +253,8 @@ them in configuration description using <<def_CF_INIT,`CF_INIT`>> and
 
 The hooks should follow similar guidelines as custom parsers (well,
 init hooks do not need to call @cf_journal_block()) to support
 
 The hooks should follow similar guidelines as custom parsers (well,
 init hooks do not need to call @cf_journal_block()) to support

-journaling. If you change nothing in the commit hook, you do not need
-to care about the journaling either.
+journalling. If you change nothing in the commit hook, you do not need
+to care about the journalling either.

 
 You may use the return value to inform about errors. Just return the
 error message, or NULL if everything went well.
 
 You may use the return value to inform about errors. Just return the
 error message, or NULL if everything went well.


@@ -280,8 +269,7 @@ the same as the one of a hook.
 ucw/conf.h
 ----------
 
 ucw/conf.h
 ----------
 

-Use this file if you want define a configuration section, request
-loading of some variables or create new item type.
+This header file contains the public interface of the configuration module.

 
 !!ucw/conf.h
 
 
 !!ucw/conf.h
 


@@ -290,6 +278,47 @@ ucw/getopt.h
 ------------
 
 This header contains routines for parsing command line arguments and
 ------------
 
 This header contains routines for parsing command line arguments and

-loading the configuration.
+loading the default configuration.
+
+In new programs, please consider using the new <<opt:,option parser>>
+instead. The getopt interface is already considered obsolete and may
+be removed in the future.

 
 !!ucw/getopt.h
 
 !!ucw/getopt.h

+
+Example
+~~~~~~~
+Typically, @cf_getopt() is used as follows: it works like
+the traditional @getopt_long() from the C library, but it also handles
+configuration files.
+
+  #include <ucw/lib.h>
+  #include <ucw/conf.h>
+  #include <ucw/getopt.h>
+
+  static char short_opts[] = CF_SHORT_OPTS "v";
+  static struct option long_opts[] = {
+    CF_LONG_OPTS
+    { "verbose", 0, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+
+  static int verbose;
+
+  int main(int argc, char *argv[]) {
+    cf_def_file = "default.cf";
+    int opt;
+    while((opt = cf_getopt(argc, argv, short_opts, long_opts, NULL)) >= 0)
+      switch(opt) {
+       case 'v': verbose = 1; break;
+       default: fprintf("Unknown option %c\n", opt); return 1;
+      }
+  }
+
+The `short_opts` and `long_opts` variables describe the command line
+arguments. Notice the `CF_SHORT_OPTS` and `CF_LONG_OPTS` macros. They
+add the `-S` and `-C` options for the configuration parser as described
+in <<config:>>. These options are handled internally by @cf_getopt().
+
+You can rely on the configuration files having been loaded before the
+first of your program's options is parsed.