Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
cc6d05a1
Commit
cc6d05a1
authored
Feb 12, 2019
by
antirez
Browse files
Merge branch 'unstable' of github.com:/antirez/redis into unstable
parents
f0c7cfa4
efeebb61
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/debug.c
View file @
cc6d05a1
...
...
@@ -803,7 +803,7 @@ static void *getMcontextEip(ucontext_t *uc) {
#endif
#elif defined(__linux__)
/* Linux */
#if defined(__i386__)
#if defined(__i386__)
|| defined(__ILP32__)
return
(
void
*
)
uc
->
uc_mcontext
.
gregs
[
14
];
/* Linux 32 */
#elif defined(__X86_64__) || defined(__x86_64__)
return
(
void
*
)
uc
->
uc_mcontext
.
gregs
[
16
];
/* Linux 64 */
...
...
@@ -915,7 +915,7 @@ void logRegisters(ucontext_t *uc) {
/* Linux */
#elif defined(__linux__)
/* Linux x86 */
#if defined(__i386__)
#if defined(__i386__)
|| defined(__ILP32__)
serverLog
(
LL_WARNING
,
"
\n
"
"EAX:%08lx EBX:%08lx ECX:%08lx EDX:%08lx
\n
"
...
...
src/networking.c
View file @
cc6d05a1
...
...
@@ -1781,7 +1781,7 @@ sds catClientInfoString(sds s, client *client) {
if
(
emask
&
AE_WRITABLE
)
*
p
++
=
'w'
;
*
p
=
'\0'
;
return
sdscatfmt
(
s
,
"id=%U addr=%s fd=%i name=%s age=%I idle=%I flags=%s db=%i sub=%i psub=%i multi=%i qbuf=%U qbuf-free=%U obl=%U oll=%U omem=%U events=%s cmd=%s"
,
"id=%U addr=%s fd=%i name=%s age=%I idle=%I flags=%s db=%i sub=%i psub=%i multi=%i qbuf=%U qbuf-free=%U obl=%U oll=%U omem=%U events=%s cmd=%s
user=%s
"
,
(
unsigned
long
long
)
client
->
id
,
getClientPeerId
(
client
),
client
->
fd
,
...
...
@@ -1799,7 +1799,8 @@ sds catClientInfoString(sds s, client *client) {
(
unsigned
long
long
)
listLength
(
client
->
reply
),
(
unsigned
long
long
)
getClientOutputBufferMemoryUsage
(
client
),
events
,
client
->
lastcmd
?
client
->
lastcmd
->
name
:
"NULL"
);
client
->
lastcmd
?
client
->
lastcmd
->
name
:
"NULL"
,
client
->
user
?
client
->
user
->
name
:
""
);
}
sds
getAllClientsInfoString
(
int
type
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment