projects / packages / squid.git / blame
| Commit | Line | Data |
|---|---|---|
| 36aa8c36 JR |
1 | Index: squid3/src/SwapDir.cc |
| 2 | diff -c squid3/src/SwapDir.cc:1.4 squid3/src/SwapDir.cc:1.5 | |
| 3 | *** squid3/src/SwapDir.cc:1.4 Tue Jul 22 09:23:01 2003 | |
| 4 | --- squid3/src/SwapDir.cc Sun Aug 31 15:20:08 2003 | |
| 5 | *************** | |
| 6 | *** 154,159 **** | |
| 7 | --- 154,161 ---- | |
| 8 | if (value) | |
| 9 | *value++ = '\0'; /* cut on = */ | |
| 10 | ||
| 11 | + debugs(3,2, "SwapDir::parseOptions: parsing store option '" << name << "'='" << (value ? value : "") << "'"); | |
| 12 | + | |
| 13 | if (newOption) | |
| 14 | if (!newOption->parse(name, value, reconfiguring)) | |
| 15 | self_destruct(); | |
| 16 | Index: squid3/src/fs/coss/store_dir_coss.cc | |
| 17 | diff -c squid3/src/fs/coss/store_dir_coss.cc:1.49 squid3/src/fs/coss/store_dir_coss.cc:1.50 | |
| 18 | *** squid3/src/fs/coss/store_dir_coss.cc:1.49 Sat Aug 30 00:39:24 2003 | |
| 19 | --- squid3/src/fs/coss/store_dir_coss.cc Sun Aug 31 15:20:10 2003 | |
| 20 | *************** | |
| 21 | *** 49,57 **** | |
| 22 | ||
| 23 | typedef struct _RebuildState RebuildState; | |
| 24 | ||
| 25 | - void storeCossDirParseBlkSize(SwapDir *, const char *, const char *, int); | |
| 26 | - void storeCossDirDumpBlkSize(StoreEntry *, const char *, const SwapDir *); | |
| 27 | - | |
| 28 | struct _RebuildState | |
| 29 | { | |
| 30 | CossSwapDir *sd; | |
| 31 | --- 49,54 ---- | |
| 32 | *************** | |
| 33 | *** 900,906 **** | |
| 34 | } | |
| 35 | ||
| 36 | ||
| 37 | ! CossSwapDir::CossSwapDir() : SwapDir ("coss"), fd (-1), swaplog_fd(-1), count(0), current_membuf (NULL), current_offset(0), numcollisions(0) | |
| 38 | { | |
| 39 | membufs.head = NULL; | |
| 40 | membufs.tail = NULL; | |
| 41 | --- 897,903 ---- | |
| 42 | } | |
| 43 | ||
| 44 | ||
| 45 | ! CossSwapDir::CossSwapDir() : SwapDir ("coss"), fd (-1), swaplog_fd(-1), count(0), current_membuf (NULL), current_offset(0), numcollisions(0), blksz_bits(0) | |
| 46 | { | |
| 47 | membufs.head = NULL; | |
| 48 | membufs.tail = NULL; | |
| 49 | *************** | |
| 50 | *** 912,917 **** | |
| 51 | --- 909,922 ---- | |
| 52 | bool | |
| 53 | CossSwapDir::optionBlockSizeParse(const char *option, const char *value, int reconfiguring) | |
| 54 | { | |
| 55 | + assert(option); | |
| 56 | + | |
| 57 | + if (strcmp(option, "block-size") != 0) | |
| 58 | + return false; | |
| 59 | + | |
| 60 | + if (!value) | |
| 61 | + self_destruct(); | |
| 62 | + | |
| 63 | int blksz = atoi(value); | |
| 64 | ||
| 65 | if (blksz == (1 << blksz_bits)) |