public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: Lon Hohberger <lon@fedoraproject.org> To: cluster-cvs-relay@redhat.com Subject: cluster: master - qdisk: Update man page. Nuke crc32 code and use zlib. Date: Wed, 19 Nov 2008 19:33:00 -0000 [thread overview] Message-ID: <20081119193227.A553A120380@lists.fedorahosted.org> (raw) Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=55fac034cd7522191553dd9b89b9396e21289efa Commit: 55fac034cd7522191553dd9b89b9396e21289efa Parent: 08ae3ce147b2771c5ee6e1d364a5e48c88384427 Author: Lon Hohberger <lhh@redhat.com> AuthorDate: Wed Nov 19 14:30:48 2008 -0500 Committer: Lon Hohberger <lhh@redhat.com> CommitterDate: Wed Nov 19 14:30:48 2008 -0500 qdisk: Update man page. Nuke crc32 code and use zlib. * Show which options may be reconfigured while qdiskd is running (either from a cman config update callback or using kill -HUP). * Shipping our own crc32 algorithm is a waste of code space. --- cman/man/qdisk.5 | 24 +++++++++----- cman/qdisk/Makefile | 2 +- cman/qdisk/crc32.c | 87 +++++--------------------------------------------- 3 files changed, 26 insertions(+), 87 deletions(-) diff --git a/cman/man/qdisk.5 b/cman/man/qdisk.5 index dcf0908..8ac9ad5 100644 --- a/cman/man/qdisk.5 +++ b/cman/man/qdisk.5 @@ -243,21 +243,22 @@ has a high enough score. \fIlog_level\fP\fB="\fP4\fB"\fP .in 12 This controls the verbosity of the quorum daemon in the system logs. -0 = emergencies; 7 = debug. +0 = emergencies; 7 = debug. This option is deprecated. .in 9 \fIlog_facility\fP\fB="\fPdaemon\fB"\fP .in 12 This controls the syslog facility used by the quorum daemon when logging. For a complete list of available facilities, see \fBsyslog.conf(5)\fP. -The default value for this is 'daemon'. +The default value for this is 'daemon'. This option is deprecated. .in 9 \fIstatus_file\fP\fB="\fP/foo\fB"\fP .in 12 Write internal states out to this file periodically ("-" = use stdout). This is primarily used for debugging. The default value for this -attribute is undefined. +attribute is undefined. This option can be changed while qdiskd is +running. .in 9 \fImin_score\fP\fB="\fP3\fB"\fP @@ -273,21 +274,24 @@ disk will never be available. .in 12 If set to 0 (off), qdiskd will *not* reboot after a negative transition as a result in a change in score (see section 2.2). The default for -this value is 1 (on). +this value is 1 (on). This option can be changed while qdiskd is +running. .in 9 \fIallow_kill\fP\fB="\fP1\fB"\fP .in 12 If set to 0 (off), qdiskd will *not* instruct to kill nodes it thinks are dead (as a result of not writing to the quorum disk). The default -for this value is 1 (on). +for this value is 1 (on). This option can be changed while qdiskd +is running. .in 9 \fIparanoid\fP\fB="\fP0\fB"\fP .in 12 If set to 1 (on), qdiskd will watch internal timers and reboot the node if it takes more than (interval * tko) seconds to complete a quorum disk -pass. The default for this value is 0 (off). +pass. The default for this value is 0 (off). This option can be changed +while qdiskd is running. .in 9 \fIscheduler\fP\fB="\fPrr\fB"\fP @@ -304,6 +308,7 @@ Valid values for 'rr' and 'fifo' are 1..100 inclusive. Valid values for 'other' are -20..20 inclusive. Sets the priority of the main & score threads. The default value is 1 (in the RR and FIFO queues, higher numbers denote higher priority; in OTHER, lower values denote higher priority). +This option can be changed while qdiskd is running. .in 9 \fIstop_cman\fP\fB="\fP0\fB"\fP @@ -313,6 +318,7 @@ If this parameter is set to 1 (on), qdiskd will tell CMAN to leave the cluster if it is unable to initialize the quorum disk during startup. This can be used to prevent cluster participation by a node which has been disconnected from the SAN. The default for this value is 0 (off). +This option can be changed while qdiskd is running. .in 9 \fIuse_uptime\fP\fB="\fP1\fB"\fP @@ -352,14 +358,16 @@ device name. If we receive an I/O error during a cycle, we do not poll CMAN and tell it we are alive. If specified, this value will cause qdiskd to exit after the specified number of consecutive cycles during which I/O errors -occur. The default is 0 (no maximum). +occur. The default is 0 (no maximum). This option can be changed while +qdiskd is running. .in 8 \fB/>\fP .in 0 .SH "3.2. The <heuristic> tag" -This tag is a child of the <quorumd> tag. +This tag is a child of the <quorumd> tag. Heuristics may not be changed +while qdiskd is running. .in 8 \fB<heuristic\fP diff --git a/cman/qdisk/Makefile b/cman/qdisk/Makefile index 8c90001..971dffd 100644 --- a/cman/qdisk/Makefile +++ b/cman/qdisk/Makefile @@ -17,7 +17,7 @@ CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${corosyncincdir} CFLAGS += -I$(S) CFLAGS += -I${incdir} -LDFLAGS += -L${corosynclibdir} -llogsys -lpthread +LDFLAGS += -L${corosynclibdir} -llogsys -lpthread -lz LDFLAGS += -L${libdir} EXTRA_LDFLAGS += -L${cmanlibdir} -L${ccslibdir} -lcman -lccs diff --git a/cman/qdisk/crc32.c b/cman/qdisk/crc32.c index 597d0b7..d4db6e1 100644 --- a/cman/qdisk/crc32.c +++ b/cman/qdisk/crc32.c @@ -1,80 +1,13 @@ /** @file * Calculates CRC32s on data. */ - #include <stdint.h> #include <sys/types.h> #include <stdio.h> #include <sys/types.h> #include <unistd.h> - -static const unsigned long crctable[256] = { - 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, - 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, - 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, - 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, - 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, - 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, - 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, - 0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5, - 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, - 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, - 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, - 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, - 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, - 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f, - 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, - 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, - 0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a, - 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, - 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, - 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01, - 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, - 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, - 0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c, - 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, - 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, - 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, - 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, - 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, - 0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, - 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, - 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, - 0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, - 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, - 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, - 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, - 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, - 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, - 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7, - 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, - 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, - 0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, - 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, - 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, - 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79, - 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, - 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, - 0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, - 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, - 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, - 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713, - 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, - 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, - 0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e, - 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, - 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, - 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, - 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, - 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, - 0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0, - 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, - 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, - 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf, - 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, - 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d, -}; - +#ifndef NO_ZLIB +#include <zlib.h> /** * Calculate CRC32 of a data set. @@ -85,13 +18,11 @@ static const unsigned long crctable[256] = { */ uint32_t clu_crc32(const char *data, size_t count) { - uint32_t x; - uint32_t crc = (uint32_t)~0; - - for (x = 0; x < count; x++) - crc = (crc >> 8) ^ crctable[(crc ^ data[x]) & 0xff]; - - if (crc == (uint32_t)~0) - return 0; - return ~crc; + return (uint32_t)crc32(0L, (const Bytef *)data, (uInt)count); } + +#else + +#error "zlib is your friend." + +#endif
reply other threads:[~2008-11-19 19:33 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20081119193227.A553A120380@lists.fedorahosted.org \ --to=lon@fedoraproject.org \ --cc=cluster-cvs-relay@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).