Updated libucw config from upstream.

diff --git a/cf/libucw b/cf/libucw
index ae12f4350fcf5760937e7106b5c0aad68d00ca8b..b92efad696c4b3619fc107a80728eadf1d8535f5 100644 (file)
--- a/cf/libucw
+++ b/cf/libucw
@@ -1,4 +1,4 @@
-# Configuration of libucw modules
+# Configuration of the UCW library and related utilities (included by cf/sherlock)
 
 ######## Memory Mapped Access to Files ##########################################
 
@@ -22,6 +22,15 @@ FBDirect {
 
 }
 
+######## Atomic Multi-Threaded I/O on Files #####################################
+
+FBAtomic {
+
+# Enable tracing
+#Trace                 1
+
+}
+
 ######## Parametrized I/O on Files ##############################################
 
 FBParam {
@@ -51,9 +60,18 @@ WriteBack            1
 
 Tempfiles {
 
-# Filename prefix for temporary files ("pid(-tid)-counter" is appended)
-# The directory should not be writeable by malicious users.
-Prefix                 tmp/temp
+# By default, we use the system's default temporary directory ($TMPDIR or /tmp),
+# but sometimes it is better to store the temporary files in the local tree.
+Dir                    tmp
+
+# Prefix of temporary file names
+Prefix                 temp-
+
+# By default, we append a random number to Prefix to get a temporary file name.
+# If Prefix points to a directory that is not writable by malicious users,
+# we can be less careful and use more consistent names of temporary files
+# formed by adding "pid(-tid)-counter" instead.
+PublicDir              0
 
 }
 
@@ -154,3 +172,73 @@ MaxRepeatLength            4
 MaxOccurences          4
 
 }
+
+######## Logging ################################################################
+
+Logging {
+
+# In this section, you can define various logging streams which can be referred to by other sections.
+
+# Stream {
+#      # The name of the stream
+#      Name            test-log
+#
+#      # When it should log the messages to a file, a name of the file should be specified.
+#      # Escape sequences for current date and time as described in strftime(3) can be used.
+#      FileName        log/test-%Y%m%d
+#
+#      # Instead of a file, a syslog facility can be specified. See syslog(3) for an explanation.
+#      SyslogFacility  daemon
+#
+#      # You can request that syslog includes a process ID in each message. Due to inflexibility
+#      # of the syslog protocol, all syslog streams active at a moment must agree on this setting.
+#      # (default: 0)
+#      SyslogPID       1
+#
+#      # When logging to files, timestamps with microsecond precision can be requested. (default: 0)
+#      Microseconds    1
+#
+#      # Messages logged to this stream can be restricted to a subset of severity levels.
+#      # Available levels are: debug info warn error info_r warn_r error_r fatal.
+#      # This configuration item is a bitmap with a default of "all", so we need the ":reset" operator.
+#      Levels:reset    info warn error fatal
+#
+#      # Similarly, messages can be restricted to a subset of message types. The types are
+#      # specific for each program. This configuration item is a list of type names; by default
+#      # it is empty, which is equivalent to all types being enabled.
+#      Types:reset     default foo
+#
+#      # Should the message types be logged? They usually do not carry much useful
+#      # information for the viewer of the log, so they are not included by default,
+#      # but you might want to see them when tuning the Types setting. (default: 0)
+#      ShowTypes       1
+#
+#      # If an error occurs when logging a message to this stream, the program normally
+#      # logs a special error message to the other streams and continues running. You can
+#      # however request to exit the program in such cases, so that the log files are
+#      # guaranteed to be complete. (default: 0)
+#      ErrorsFatal     1
+#
+#      # Let stderr of the program point to this file-based log_stream (default: 0)
+#      StdErrFollows   1
+#
+#      # Some events are logworthy, but they could happen too frequently and flood the log.
+#      # You can avoid the flooding by setting up a rate limiter for a specific subset of
+#      # message types. If more limiters match the type of a message, only the last one applies.
+#      Limit {
+#              # A list of message types (default: empty = all types)
+#              Types           default foo
+#
+#              # The maximum allowed sustained rate (messages/second, may be fractional)
+#              Rate            1
+#
+#              # Maximum length of a burst temporarily exceeding the rate (default: try to guess)
+#              Burst           2
+#      }
+#
+#      # The messages that have passed the filters and limiters can be forwarded to other
+#      # log streams. Logging loops are not healthy for your program :)  (a list of stream names)
+#      Substream       another-stream
+# }
+
+}