Changeset 331 for EcnlProtoTool/trunk/asp3_dcre/tinet/net/net_buf.c

Timestamp:

Jan 21, 2018, 12:10:09 AM (6 years ago)

Author:

coas-nagasima

Message:

prototoolに関連するプロジェクトをnewlibからmuslを使うよう変更・更新
ntshellをnewlibの下位の実装から、muslのsyscallの実装に変更・更新
以下のOSSをアップデート
・mruby-1.3.0
・musl-1.1.18
・onigmo-6.1.3
・tcc-0.9.27
以下のOSSを追加
・openssl-1.1.0e
・curl-7.57.0
・zlib-1.2.11
以下のmrbgemsを追加
・iij/mruby-digest
・iij/mruby-env
・iij/mruby-errno
・iij/mruby-iijson
・iij/mruby-ipaddr
・iij/mruby-mock
・iij/mruby-require
・iij/mruby-tls-openssl

File:

• EcnlProtoTool/trunk/asp3_dcre/tinet/net/net_buf.c (modified) (15 diffs)

EcnlProtoTool/trunk/asp3_dcre/tinet/net/net_buf.c

@@ -2 +2 @@
  *  TINET (TCP/IP Protocol Stack)
  * 
- *  Copyright (C) 2001-2009 by Dep. of Computer Science and Engineering
+ *  Copyright (C) 2001-2017 by Dep. of Computer Science and Engineering
  *                   Tomakomai National College of Technology, JAPAN
  *
@@ -57 +57 @@
 #include <net/ethernet.h>
 #include <net/net.h>
+#include <net/net_endian.h>
 #include <net/net_buf.h>
 #include <net/net_count.h>
@@ -62 +63 @@
 #include <netinet/in.h>
 #include <netinet/in_var.h>
-#include <netinet6/in6.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
-#include <netinet/ip6.h>
-#include <netinet6/ip6_var.h>
 #include <netinet/tcp.h>
-#include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
 
@@ -98 +95 @@
 
 #if defined(NUM_MPF_NET_BUF6_REASSM) && NUM_MPF_NET_BUF6_REASSM > 0
+
         {
                 MPF_NET_BUF_REASSM,
@@ -109 +107 @@
 
                 },
-#endif  /* of #if defined(NUM_MPF_NET_BUF6_REASSM) && NUM_MPF_NET_BUF6_REASSM > 0 */
+
+#else   /* of #if defined(NUM_MPF_NET_BUF6_REASSM) && NUM_MPF_NET_BUF6_REASSM > 0 */
 
 #if defined(NUM_MPF_NET_BUF4_REASSM) && NUM_MPF_NET_BUF4_REASSM > 0
+
         {
                 MPF_NET_BUF_REASSM,
@@ -123 +123 @@
 
                 },
+
 #endif  /* of #if defined(NUM_MPF_NET_BUF4_REASSM) && NUM_MPF_NET_BUF4_REASSM > 0 */
+
+#endif  /* of #if defined(NUM_MPF_NET_BUF6_REASSM) && NUM_MPF_NET_BUF6_REASSM > 0 */
 
 #if defined(NUM_MPF_NET_BUF_IF_PDU) && NUM_MPF_NET_BUF_IF_PDU > 0
@@ -223 +226 @@
 #endif  /* of #if defined(NUM_MPF_NET_BUF_128) && NUM_MPF_NET_BUF_128 > 0 */
 
-#if defined(SUPPORT_INET4)
+#if defined(_IP4_CFG)
 
 #if defined(NUM_MPF_NET_BUF_64) && NUM_MPF_NET_BUF_64 > 0
@@ -239 +242 @@
 #endif  /* of #if defined(NUM_MPF_NET_BUF_64) && NUM_MPF_NET_BUF_64 > 0 */
 
-#endif  /* of #if defined(SUPPORT_INET4) */
+#endif  /* of #if defined(_IP4_CFG) */
 
 #if defined(NUM_MPF_NET_BUF_CSEG) && NUM_MPF_NET_BUF_CSEG > 0
@@ -308 +311 @@
                         (*buf)->len   = (uint16_t)minlen;
                         (*buf)->flags = 0;
+
+#if NET_COUNT_ENABLE & PROTO_FLG_NET_BUF
                         NET_COUNT_NET_BUF(net_buf_table[ix].allocs, 1);
+                        net_buf_table[ix].busies ++;
+#endif
                         return error;
                         }
@@ -316 +323 @@
                 }
 
-        syslog(LOG_WARNING, "[NET BUF] busy, index=%d, len=%4d.", (uint16_t)req_ix, minlen);
+        syslog(LOG_WARNING, "[BUF] busy, up   index:%d,%d[%4d], len:%4d.",
+                            (uint16_t)req_ix, ix, net_buf_table[req_ix].size, minlen);
         *buf = NULL;
         NET_COUNT_NET_BUF(net_buf_table[req_ix].errors, 1);
@@ -346 +354 @@
                         (*buf)->len   = net_buf_table[ix].size;
                         (*buf)->flags = 0;
+
+#if NET_COUNT_ENABLE & PROTO_FLG_NET_BUF
                         NET_COUNT_NET_BUF(net_buf_table[ix].allocs, 1);
+                        net_buf_table[ix].busies ++;
+#endif
                         return error;
                         }
@@ -354 +366 @@
                 }
 
-        syslog(LOG_WARNING, "[NET BUF] busy, index=%d, len=%4d.", (uint16_t)req_ix, maxlen);
+        syslog(LOG_WARNING, "[BUF] busy, down index:%d,%d[%4d], len:%4d.",
+                            (uint16_t)req_ix, ix, net_buf_table[req_ix].size, minlen);
         *buf = NULL;
         NET_COUNT_NET_BUF(net_buf_table[req_ix].errors, 1);
@@ -380 +393 @@
                 }
 
+#if defined(SUPPORT_TCP) && defined(TCP_CFG_SWBUF_CSAVE)
+
         /* TCP で予約したネットワークバッファを取り出す。*/
         if ((nbatr & NBA_RESERVE_TCP) != 0) {
@@ -386 +401 @@
                         }
                 }
+
+#endif  /* of #if defined(SUPPORT_TCP) && defined(TCP_CFG_SWBUF_CSAVE) */
 
         if ((nbatr & NBA_SEARCH_DESCENT) != 0)
@@ -423 +440 @@
         else {
 
+#if defined(SUPPORT_TCP) && defined(TCP_CFG_SWBUF_CSAVE)
+
                 /* TCP で、ネットワークバッファを予約する。*/
                 if (TCP_PUSH_RES_NBUF(buf) == NULL)
                         return E_OK;
 
+#endif  /* of #if defined(SUPPORT_TCP) && defined(TCP_CFG_SWBUF_CSAVE) */
+
                 /* 固定メモリプールに返す。*/
-                if ((error = rel_mpf((ID)net_buf_table[buf->idix].index, buf)) != E_OK)
+
+#if NET_COUNT_ENABLE & PROTO_FLG_NET_BUF
+                net_buf_table[buf->idix].busies --;
+#endif
+                if ((error = rel_mpf((ID)net_buf_table[buf->idix].index, buf)) != E_OK) {
                         syslog(LOG_WARNING, "[NET BUF] %s, ID=%d.", itron_strerror(error), buf->idix);
+                        }
                 }
         return error;