<pre style='margin:0'>
Eitan Adler (grimreaper) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6935f6ab1cf8b99c9ca0cdaa2f8d03a5566b4e73">https://github.com/macports/macports-ports/commit/6935f6ab1cf8b99c9ca0cdaa2f8d03a5566b4e73</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 6935f6a netperf: enable demo mode
</span>6935f6a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6935f6ab1cf8b99c9ca0cdaa2f8d03a5566b4e73
</span>Author: Eitan Adler <grimreaper@macports.org>
AuthorDate: Thu Jul 5 21:55:48 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> netperf: enable demo mode
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also fix the port to use github portgroup properly. The patch file is a
</span><span style='display:block; white-space:pre;color:#404040;'> partial patch from 40c8a0f of the upstream repository.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Demo mode is required for use "flent", a tool to visualize the output of
</span><span style='display:block; white-space:pre;color:#404040;'> netperf.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Note that configure argument to this program affect its output, formats,
</span><span style='display:block; white-space:pre;color:#404040;'> and other things that really should be run-time toggles. Be careful when
</span><span style='display:block; white-space:pre;color:#404040;'> selecting them.
</span>---
net/netperf/Portfile | 15 +-
.../40c8a0fb873ac07a95f0c0253b2bd66109aa4c51.diff | 170 +++++++++++++++++++++
2 files changed, 179 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/netperf/Portfile b/net/netperf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4d7ab43..92050c1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/netperf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/netperf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,13 +3,12 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# When updating this port to the next version, please return to correct usage of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# the github portgroup by removing the overrides for master_sites and worksrcdir.
</span> github.setup HewlettPackard netperf 2.7.0 netperf-
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories net
license Noncommercial BSD BSD-old
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin freebsd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {grimreaper @grimreaper} openmaintainer
</span>
description a network performance benchmark
long_description Netperf is a benchmark that can be used to measure \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,10 +20,14 @@ long_description Netperf is a benchmark that can be used to measure \
</span> HP HiPPI LLA may be conditionally compiled-in.
homepage https://hewlettpackard.github.io/netperf/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://github.com/HewlettPackard/netperf/archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles 40c8a0fb873ac07a95f0c0253b2bd66109aa4c51.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# openmaintainer does not apply to the configure argument. Talk with me before touching them.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --enable-demo
</span>
checksums rmd160 ea5f83cce4bf03884c3c4ed3278146976627af0a \
sha256 4569bafa4cca3d548eb96a486755af40bd9ceb6ab7c6abd81cc6aa4875007c4e \
size 1993943
<span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir netperf-netperf-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir netperf-netperf-${github.version}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/netperf/files/40c8a0fb873ac07a95f0c0253b2bd66109aa4c51.diff b/net/netperf/files/40c8a0fb873ac07a95f0c0253b2bd66109aa4c51.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..dd91cbe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/netperf/files/40c8a0fb873ac07a95f0c0253b2bd66109aa4c51.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,170 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/net_uuid.c src/net_uuid.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index fd14db4..1e18831 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/net_uuid.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/net_uuid.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,6 +42,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define UUIDS_PER_TICK 1024
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define WIN32_LEAN_AND_MEAN 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <windows.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "missing\stdint.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define snprintf _snprintf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -81,7 +82,6 @@ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char nodeID[6];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } uuid_node_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#undef uuid_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint32_t time_low;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint16_t time_mid;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -89,7 +89,7 @@ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t clock_seq_hi_and_reserved;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t clock_seq_low;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t node[6];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} uuid_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++} netperf_uuid_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* some forward declarations. kind of wimpy to do that but heck, we
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ are all friends here right? raj 20081024 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -197,7 +197,7 @@ static uint16_t true_random(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* puid -- print a UUID */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void puid(uuid_t u)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void puid(netperf_uuid_t u)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -210,7 +210,7 @@ void puid(uuid_t u)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* snpuid -- print a UUID in the supplied buffer */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void snpuid(char *str, size_t size, uuid_t u) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void snpuid(char *str, size_t size, netperf_uuid_t u) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *tmp = str;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -295,7 +295,7 @@ static void get_ieee_node_identifier(uuid_node_t *node)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* format_uuid_v1 -- make a UUID from the timestamp, clockseq,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ and node ID */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static void format_uuid_v1(uuid_t* uuid, uint16_t clock_seq,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static void format_uuid_v1(netperf_uuid_t* uuid, uint16_t clock_seq,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uuid_time_t timestamp, uuid_node_t node)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Construct a version 1 uuid with the information we've gathered
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -312,7 +312,7 @@ static void format_uuid_v1(uuid_t* uuid, uint16_t clock_seq,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* uuid_create -- generator a UUID */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int uuid_create(uuid_t *uuid)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int uuid_create(netperf_uuid_t *uuid)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uuid_time_t timestamp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint16_t clockseq;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -331,7 +331,7 @@ int uuid_create(uuid_t *uuid)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void get_uuid_string(char *uuid_str, size_t size) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uuid_t u;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ netperf_uuid_t u;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uuid_create(&u);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ snpuid(uuid_str,size,u);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -344,7 +344,7 @@ void get_uuid_string(char *uuid_str, size_t size) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main(int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uuid_t u;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ netperf_uuid_t u;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char uuid_str[38];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uuid_create(&u);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/netlib.c src/netlib.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2195c9b..62cbe15 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/netlib.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/netlib.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -110,6 +110,7 @@ char netlib_id[]="\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <winsock2.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define netperf_socklen_t socklen_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define WIN32_LEAN_AND_MEAN 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <windows.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <mmsystem.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* the only time someone should need to define DONT_IPV6 in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -119,8 +120,6 @@ char netlib_id[]="\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <ws2tcpip.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <windows.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SIGALRM (14)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define sleep(x) Sleep((x)*1000)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4013,11 +4012,7 @@ void demo_stream_setup(uint32_t a, uint32_t b) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-__forceinline void demo_interval_display(double actual_interval)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- inline void demo_interval_display(double actual_interval)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void demo_interval_display(double actual_interval)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int count = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct timeval now;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4076,15 +4071,7 @@ __forceinline void demo_interval_display(double actual_interval)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ important compilers have supported such a construct so it should
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ not be a big deal. raj 2012-01-23 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* It would seem that the Microsoft compiler will not inline across
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- source files. So there is little point in having an inline
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- directive in that situation. Of course that makes me wonder if an
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- inline directive has to appear in netlib.h... */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void demo_interval_tick(uint32_t units)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- inline void demo_interval_tick(uint32_t units)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double actual_interval = 0.0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/netperf.c src/netperf.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9344533..99563e7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/netperf.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/netperf.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,6 +67,7 @@ char netperf_id[]="\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <winsock2.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define WIN32_LEAN_AND_MEAN 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <windows.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "missing\stdint.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* WIN32 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/netserver.c src/netserver.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9534722..03e987c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/netserver.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/netserver.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -126,6 +126,7 @@ char netserver_id[]="\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <ws2tcpip.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define WIN32_LEAN_AND_MEAN 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <windows.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "missing\stdint.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/nettest_bsd.c src/nettest_bsd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 74ee34a..8a057c4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/nettest_bsd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/nettest_bsd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -124,6 +124,8 @@ char nettest_id[]="\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef DONT_IPV6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <ws2tcpip.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define WIN32_LEAN_AND_MEAN 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <windows.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define sleep(x) Sleep((x)*1000)
</span></pre><pre style='margin:0'>
</pre>