diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/erl_interface/doc/src/notes.xml | 14 | ||||
| -rw-r--r-- | lib/erl_interface/src/connect/eirecv.c | 16 | ||||
| -rw-r--r-- | lib/erl_interface/src/connect/send.c | 3 | ||||
| -rw-r--r-- | lib/erl_interface/src/connect/send_exit.c | 3 | ||||
| -rw-r--r-- | lib/erl_interface/src/connect/send_reg.c | 3 | ||||
| -rw-r--r-- | lib/erl_interface/vsn.mk | 2 | 
6 files changed, 26 insertions, 15 deletions
diff --git a/lib/erl_interface/doc/src/notes.xml b/lib/erl_interface/doc/src/notes.xml index 8e379463ad..ff89802599 100644 --- a/lib/erl_interface/doc/src/notes.xml +++ b/lib/erl_interface/doc/src/notes.xml @@ -30,6 +30,20 @@    </header>    <p>This document describes the changes made to the Erl_interface application.</p> +<section><title>Erl_Interface 3.7.1.1</title> +    <section><title>Fixed Bugs and Malfunctions</title> +      <list> +        <item> +	    <p> +		The <c>erl_interface</c> tracelevel for erlang messages was incorrect. This has now been fixed. +	    </p> +          <p> +	    Own Id: OTP-8874</p> +        </item> +    </list> +    </section> + +</section>  <section><title>Erl_Interface 3.7.1</title>      <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/erl_interface/src/connect/eirecv.c b/lib/erl_interface/src/connect/eirecv.c index 51fc32d65c..7d72ddeeae 100644 --- a/lib/erl_interface/src/connect/eirecv.c +++ b/lib/erl_interface/src/connect/eirecv.c @@ -107,7 +107,7 @@ ei_recv_internal (int fd,    switch (msg->msgtype) {    case ERL_SEND:          /* { SEND, Cookie, ToPid } */ -    if (ei_tracelevel > 0) show_this_msg = 1; +    if (ei_tracelevel >= 4) show_this_msg = 1;      if (ei_decode_atom(header,&index,msg->cookie)   	|| ei_decode_pid(header,&index,&msg->to))      { @@ -118,7 +118,7 @@ ei_recv_internal (int fd,      break;    case ERL_REG_SEND:     /* { REG_SEND, From, Cookie, ToName } */ -    if (ei_tracelevel > 0) show_this_msg = 1; +    if (ei_tracelevel >= 4) show_this_msg = 1;      if (ei_decode_pid(header,&index,&msg->from)   	|| ei_decode_atom(header,&index,msg->cookie)   	|| ei_decode_atom(header,&index,msg->toname)) @@ -133,7 +133,7 @@ ei_recv_internal (int fd,    case ERL_LINK:         /* { LINK, From, To } */    case ERL_UNLINK:       /* { UNLINK, From, To } */    case ERL_GROUP_LEADER: /* { GROUP_LEADER, From, To } */ -    if (ei_tracelevel > 1) show_this_msg = 1; +    if (ei_tracelevel >= 4) show_this_msg = 1;      if (ei_decode_pid(header,&index,&msg->from)   	|| ei_decode_pid(header,&index,&msg->to))      { @@ -145,7 +145,7 @@ ei_recv_internal (int fd,    case ERL_EXIT:         /* { EXIT, From, To, Reason } */    case ERL_EXIT2:        /* { EXIT2, From, To, Reason } */ -    if (ei_tracelevel > 1) show_this_msg = 1; +    if (ei_tracelevel >= 4) show_this_msg = 1;      if (ei_decode_pid(header,&index,&msg->from)   	|| ei_decode_pid(header,&index,&msg->to))      { @@ -156,7 +156,7 @@ ei_recv_internal (int fd,      break;    case ERL_SEND_TT:      /* { SEND_TT, Cookie, ToPid, TraceToken } */ -    if (ei_tracelevel > 0) show_this_msg = 1; +    if (ei_tracelevel >= 4) show_this_msg = 1;      if (ei_decode_atom(header,&index,msg->cookie)   	|| ei_decode_pid(header,&index,&msg->to)  	|| ei_decode_trace(header,&index,&msg->token)) @@ -169,7 +169,7 @@ ei_recv_internal (int fd,      break;    case ERL_REG_SEND_TT: /* { REG_SEND_TT, From, Cookie, ToName, TraceToken } */ -    if (ei_tracelevel > 0) show_this_msg = 1; +    if (ei_tracelevel >= 4) show_this_msg = 1;      if (ei_decode_pid(header,&index,&msg->from)   	|| ei_decode_atom(header,&index,msg->cookie)   	|| ei_decode_atom(header,&index,msg->toname) @@ -184,7 +184,7 @@ ei_recv_internal (int fd,    case ERL_EXIT_TT:     /* { EXIT_TT, From, To, TraceToken, Reason } */    case ERL_EXIT2_TT:    /* { EXIT2_TT, From, To, TraceToken, Reason } */ -    if (ei_tracelevel > 1) show_this_msg = 1; +    if (ei_tracelevel >= 4) show_this_msg = 1;      if (ei_decode_pid(header,&index,&msg->from)   	|| ei_decode_pid(header,&index,&msg->to)  	|| ei_decode_trace(header,&index,&msg->token)) @@ -197,7 +197,7 @@ ei_recv_internal (int fd,      break;    case ERL_NODE_LINK:   /* { NODE_LINK } */ -    if (ei_tracelevel > 1) show_this_msg = 1; +    if (ei_tracelevel >= 4) show_this_msg = 1;      break;    default: diff --git a/lib/erl_interface/src/connect/send.c b/lib/erl_interface/src/connect/send.c index cd832db4ea..57e32903cf 100644 --- a/lib/erl_interface/src/connect/send.c +++ b/lib/erl_interface/src/connect/send.c @@ -87,8 +87,7 @@ int ei_send_encoded_tmo(int fd, const erlang_pid *to,      put8(s, ERL_PASS_THROUGH);			      /*   1 */  				/*** sum: 1070 */ -    /* FIXME incorrect level */ -    if (ei_tracelevel > 0) +    if (ei_tracelevel >= 4)  	ei_show_sendmsg(stderr,header,msg);  #ifdef HAVE_WRITEV diff --git a/lib/erl_interface/src/connect/send_exit.c b/lib/erl_interface/src/connect/send_exit.c index 098797c96d..d4e6605a2c 100644 --- a/lib/erl_interface/src/connect/send_exit.c +++ b/lib/erl_interface/src/connect/send_exit.c @@ -88,8 +88,7 @@ int ei_send_exit_tmo(int fd, const erlang_pid *from, const erlang_pid *to,    put32be(s, index - 4);                                /*   4 */    put8(s, ERL_PASS_THROUGH);                                /*   1 */                                            /*** sum: len + 1080 */ -  /* FIXME incorrect level */ -  if (ei_tracelevel > 1) +  if (ei_tracelevel >= 4)        ei_show_sendmsg(stderr,msgbuf,NULL);    ei_write_fill_t(fd,msgbuf,index,ms);  diff --git a/lib/erl_interface/src/connect/send_reg.c b/lib/erl_interface/src/connect/send_reg.c index 8f0e40309c..779b1b8359 100644 --- a/lib/erl_interface/src/connect/send_reg.c +++ b/lib/erl_interface/src/connect/send_reg.c @@ -82,8 +82,7 @@ int ei_send_reg_encoded_tmo(int fd, const erlang_pid *from,      put32be(s, index + msglen - 4);                       /*   4 */      put8(s, ERL_PASS_THROUGH);                                /*   1 */                                                  /*** sum: 1336 */ -    /* FIXME incorrect level.... */ -    if (ei_tracelevel > 0)  +    if (ei_tracelevel >= 4)   	ei_show_sendmsg(stderr,header,msg);  #ifdef HAVE_WRITEV diff --git a/lib/erl_interface/vsn.mk b/lib/erl_interface/vsn.mk index c642cc5002..6c664959a3 100644 --- a/lib/erl_interface/vsn.mk +++ b/lib/erl_interface/vsn.mk @@ -1 +1 @@ -EI_VSN = 3.7.1 +EI_VSN = 3.7.1.1  | 
