You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by sc...@apache.org on 2018/02/07 04:30:24 UTC
[trafficserver] branch master updated: Documentation: correct
inku16 to unsigned int:16
This is an automated email from the ASF dual-hosted git repository.
scw00 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 31332f0 Documentation: correct inku16 to unsigned int:16
31332f0 is described below
commit 31332f0eb8f08c2e5f86eb1ef8ab9b5aea702fa7
Author: scw00 <sc...@apache.org>
AuthorDate: Wed Feb 7 11:19:43 2018 +0800
Documentation: correct inku16 to unsigned int:16
---
.../cache-architecture/architecture.en.rst | 2 +-
.../architecture/architecture.en.po | 4 ++--
iocore/cache/P_CacheDir.h | 26 +++++++++++-----------
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/doc/developer-guide/cache-architecture/architecture.en.rst b/doc/developer-guide/cache-architecture/architecture.en.rst
index 9db5b02..2b6cf5d 100644
--- a/doc/developer-guide/cache-architecture/architecture.en.rst
+++ b/doc/developer-guide/cache-architecture/architecture.en.rst
@@ -544,7 +544,7 @@ The in memory volume directory entries are described below.
pinned unsigned int:1 Flag: document is pinned
token unsigned int:1 Flag: Unknown
next unsigned int:16 Segment local index of next entry.
- offset_high inku16 High order offset bits
+ offset_high unsigned int:16 High order offset bits
=========== =================== ===================================================
The stripe directory is an array of ``Dir`` instances. Each entry refers to
diff --git a/doc/locale/ja/LC_MESSAGES/developer-guide/architecture/architecture.en.po b/doc/locale/ja/LC_MESSAGES/developer-guide/architecture/architecture.en.po
index 6e7235c..9f2f709 100644
--- a/doc/locale/ja/LC_MESSAGES/developer-guide/architecture/architecture.en.po
+++ b/doc/locale/ja/LC_MESSAGES/developer-guide/architecture/architecture.en.po
@@ -1068,8 +1068,8 @@ msgid "offset_high"
msgstr "offset_high"
#: ../../../developer-guide/architecture/architecture.en.rst:514
-msgid "inku16"
-msgstr "inku16"
+msgid "unsigned int:16"
+msgstr "unsigned int:16"
#: ../../../developer-guide/architecture/architecture.en.rst:514
msgid "High order offset bits"
diff --git a/iocore/cache/P_CacheDir.h b/iocore/cache/P_CacheDir.h
index b577019..ac3fee3 100644
--- a/iocore/cache/P_CacheDir.h
+++ b/iocore/cache/P_CacheDir.h
@@ -126,16 +126,16 @@ struct Dir {
// USE MACROS TO PREVENT UNALIGNED LOADS
// bits are numbered from lowest in u16 to highest
// always index as u16 to avoid byte order issues
- unsigned int offset : 24; // (0,1:0-7) 16M * 512 = 8GB
- unsigned int big : 2; // (1:8-9) 512 << (3 * big)
- unsigned int size : 6; // (1:10-15) 6**2 = 64, 64*512 = 32768 .. 64*256=16MB
- unsigned int tag : 12; // (2:0-11) 2048 / 8 entries/bucket = .4%
- unsigned int phase : 1; // (2:12)
- unsigned int head : 1; // (2:13) first segment in a document
- unsigned int pinned : 1; // (2:14)
- unsigned int token : 1; // (2:15)
- unsigned int next : 16; // (3)
- inku16 offset_high; // 8GB * 65k = 0.5PB (4)
+ unsigned int offset : 24; // (0,1:0-7) 16M * 512 = 8GB
+ unsigned int big : 2; // (1:8-9) 512 << (3 * big)
+ unsigned int size : 6; // (1:10-15) 6**2 = 64, 64*512 = 32768 .. 64*256=16MB
+ unsigned int tag : 12; // (2:0-11) 2048 / 8 entries/bucket = .4%
+ unsigned int phase : 1; // (2:12)
+ unsigned int head : 1; // (2:13) first segment in a document
+ unsigned int pinned : 1; // (2:14)
+ unsigned int token : 1; // (2:15)
+ unsigned int next : 16; // (3)
+ unsigned int offset_high : 16; // 8GB * 65k = 0.5PB (4)
#else
uint16_t w[5];
Dir() { dir_clear(this); }
@@ -150,9 +150,9 @@ struct FreeDir {
// USE MACROS TO PREVENT UNALIGNED LOADS
unsigned int offset : 24; // 0: empty
unsigned int reserved : 8;
- unsigned int prev : 16; // (2)
- unsigned int next : 16; // (3)
- inku16 offset_high; // 0: empty
+ unsigned int prev : 16; // (2)
+ unsigned int next : 16; // (3)
+ unsigned int offset_high : 16; // 0: empty
#else
uint16_t w[5];
FreeDir() { dir_clear(this); }
--
To stop receiving notification emails like this one, please contact
scw00@apache.org.