BodgeMaster
/
NORM-mirror
mirror of https://github.com/USNavalResearchLaboratory/norm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

v1.3b4

pull/2/head
Jeff Weston 2019-09-11 11:51:25 -04:00
parent 14d4ab80c6
commit 32c42ee9c0
17 changed files with 202 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
NormDeveloperGuide.html
View File

@ -6,7 +6,7 @@
<META NAME="GENERATOR" CONTENT="OpenOffice.org 1.1.3 (Linux)"> <META NAME="GENERATOR" CONTENT="OpenOffice.org 1.1.3 (Linux)">
<META NAME="AUTHOR" CONTENT="Robert Adamson"> <META NAME="AUTHOR" CONTENT="Robert Adamson">
<META NAME="CREATED" CONTENT="20040824;15180000"> <META NAME="CREATED" CONTENT="20040824;15180000">
<META NAME="CHANGED" CONTENT="20050609;13321500"> <META NAME="CHANGED" CONTENT="20050621;14191600">
<META NAME="DESCRIPTION" CONTENT="NORM Object Functions 42 NORM Object Functions NORM_OBJECT_STREAM NORM Sender Functions 19 NORM Sender Functions "> <META NAME="DESCRIPTION" CONTENT="NORM Object Functions 42 NORM Object Functions NORM_OBJECT_STREAM NORM Sender Functions 19 NORM Sender Functions ">
<META NAME="KEYWORDS" CONTENT="norm object value application function "> <META NAME="KEYWORDS" CONTENT="norm object value application function ">
<STYLE> <STYLE>
@ -99,6 +99,8 @@ communication needs.</P>
<H1 CLASS="western" ALIGN=CENTER STYLE="page-break-before: always">Table <H1 CLASS="western" ALIGN=CENTER STYLE="page-break-before: always">Table
of Contents</H1> of Contents</H1>
<DIV ID="Table of Contents1" DIR="LTR"> <DIV ID="Table of Contents1" DIR="LTR">
<P STYLE="margin-top: 0.25in; font-style: normal"><BR>
</P>
<P STYLE="margin-top: 0.25in; font-style: normal"><FONT FACE="Helvetica, sans-serif"><B>Overview</B></FONT></P> <P STYLE="margin-top: 0.25in; font-style: normal"><FONT FACE="Helvetica, sans-serif"><B>Overview</B></FONT></P>
<P STYLE="margin-top: 0.17in; font-style: normal"><FONT SIZE=2><B>API <P STYLE="margin-top: 0.17in; font-style: normal"><FONT SIZE=2><B>API
Initialization</B></FONT></P> Initialization</B></FONT></P>
@ -161,6 +163,7 @@ of Contents</H1>
<P STYLE="margin-left: 0.17in; margin-top: 0in; font-style: normal"><FONT SIZE=2><A HREF="#NormSetTxSocketBuffer()">NormSetTxSocketBuffer()</A></FONT></P> <P STYLE="margin-left: 0.17in; margin-top: 0in; font-style: normal"><FONT SIZE=2><A HREF="#NormSetTxSocketBuffer()">NormSetTxSocketBuffer()</A></FONT></P>
<P STYLE="margin-left: 0.17in; margin-top: 0in; font-style: normal"><FONT SIZE=2><A HREF="#NormSetCongestionControl()">NormSetCongestionControl()</A></FONT></P> <P STYLE="margin-left: 0.17in; margin-top: 0in; font-style: normal"><FONT SIZE=2><A HREF="#NormSetCongestionControl()">NormSetCongestionControl()</A></FONT></P>
<P STYLE="margin-left: 0.17in; margin-top: 0in; font-style: normal"><FONT SIZE=2><A HREF="#NormSetTransmitRateBounds()">NormSetTransmitRateBounds()</A></FONT></P> <P STYLE="margin-left: 0.17in; margin-top: 0in; font-style: normal"><FONT SIZE=2><A HREF="#NormSetTransmitRateBounds()">NormSetTransmitRateBounds()</A></FONT></P>
<P STYLE="margin-left: 0.17in; margin-top: 0in; font-style: normal"><FONT SIZE=2><A HREF="#NormSetTransmitCacheBounds()">NormSetTransmitCacheBounds()</A></FONT></P>
<P STYLE="margin-left: 0.17in; margin-top: 0in; font-style: normal"><FONT SIZE=2><A HREF="#NormSetAutoParity()">NormSetAutoParity()</A></FONT></P> <P STYLE="margin-left: 0.17in; margin-top: 0in; font-style: normal"><FONT SIZE=2><A HREF="#NormSetAutoParity()">NormSetAutoParity()</A></FONT></P>
<P STYLE="margin-left: 0.17in; margin-top: 0in; font-style: normal"><FONT SIZE=2><A HREF="#NormSetGrttEstimate()">NormSetGrttEstimate()</A></FONT></P> <P STYLE="margin-left: 0.17in; margin-top: 0in; font-style: normal"><FONT SIZE=2><A HREF="#NormSetGrttEstimate()">NormSetGrttEstimate()</A></FONT></P>
<P STYLE="margin-left: 0.17in; margin-top: 0in; font-style: normal"><FONT SIZE=2><A HREF="#NormAddAckingNode()">NormAddAckingNode()</A></FONT></P> <P STYLE="margin-left: 0.17in; margin-top: 0in; font-style: normal"><FONT SIZE=2><A HREF="#NormAddAckingNode()">NormAddAckingNode()</A></FONT></P>
@ -400,7 +403,7 @@ that use the NORM library, a path to the &quot;normApi.h&quot; header
file must be provided and the linker step needs to reference the NORM file must be provided and the linker step needs to reference the NORM
library file (&quot;libnorm.a&quot; for Unix platforms and &quot;Norm.lib&quot; library file (&quot;libnorm.a&quot; for Unix platforms and &quot;Norm.lib&quot;
for Win32 platforms). NORM also depends upon the NRL Protean for Win32 platforms). NORM also depends upon the NRL Protean
Protocol Prototyping toolkit&quot;Protokit&quot; library (a.k.a Protocol Prototyping toolkit &quot;Protokit&quot; library (a.k.a
&quot;Protolib&quot;) (static library files &quot;libProtokit.a&quot; &quot;Protolib&quot;) (static library files &quot;libProtokit.a&quot;
for Unix and &quot;Protokit.lib&quot; for Win32). Depending upon the for Unix and &quot;Protokit.lib&quot; for Win32). Depending upon the
platform, some additional library dependencies may be required to platform, some additional library dependencies may be required to
@ -420,13 +423,22 @@ same. With NORM, it is recommended that &quot;large file support&quot;
options be enabled when possible.</P> options be enabled when possible.</P>
<P CLASS="western" STYLE="font-style: normal">The NORM API uses <P CLASS="western" STYLE="font-style: normal">The NORM API uses
threading so that the NORM protocol engine may run independent of the threading so that the NORM protocol engine may run independent of the
application. Thus the &quot;Posix Threads&quot; library must be application. Thus the &quot;POSIX Threads&quot; library must be
included (&quot;-'pthread&quot;) in the linking step. MacOS/BSD also included (&quot;-'pthread&quot;) in the linking step. MacOS/BSD also
requires the addition of the &quot;-lresolv&quot; (resolver) library requires the addition of the &quot;-lresolv&quot; (resolver) library
and Solaris requires the dynamic loader, network/socket, and resolver and Solaris requires the dynamic loader, network/socket, and resolver
libraries (&quot;-ldl &ndash;lnsl &ndash;lsocket &ndash;lresolv&quot;) libraries (&quot;&ndash;lnsl &ndash;lsocket &ndash;lresolv&quot;) to
to achieve successful compilation. The Makefiles in the NORM source achieve successful compilation. The Makefiles in the NORM source
code distribution are a reference for these requirements.</P> code distribution are a reference for these requirements. Note that
MacOS 9 and earlier are not supported.</P>
<P CLASS="western" STYLE="font-style: normal">Additionally, it is
critical that the _FILE_OFFSET_BITS macro be consistently defined for
the NORM library build and the application build using the library.
The distributed NORM Makefiles have &ndash;D_FILE_OFFSET_BITS=64 set
in the compilation to enable &quot;large file support&quot;.
Applications built using NORM should have the same compilation option
set to operate correctly (The definition of the <FONT FACE="Courier"><A HREF="#NormSize">NormSize</A></FONT>
type in &quot;normApi.h&quot; depends upon this compilation flag).</P>
<H2 CLASS="western">Win32/WiNCE Platforms</H2> <H2 CLASS="western">Win32/WiNCE Platforms</H2>
<P CLASS="western" STYLE="font-style: normal">NORM has been built <P CLASS="western" STYLE="font-style: normal">NORM has been built
using Microsoft's Visual C++ (6.0 and .NET) and Embedded VC++ 4.2 using Microsoft's Visual C++ (6.0 and .NET) and Embedded VC++ 4.2
@ -815,10 +827,11 @@ function call.</P>
refer to the transport object identified by the event's &quot;object' refer to the transport object identified by the event's &quot;object'
field. Typically, this will occur when the application has field. Typically, this will occur when the application has
enqueued more objects than space available within the set sender enqueued more objects than space available within the set sender
transmit cache bounds. Posting of this notification means the transmit cache bounds (see <FONT FACE="Courier"><A HREF="#NormSetTransmitCacheBounds()">NormSetTransmitCacheBounds()</A></FONT>).
application is free to free any resources (memory, files, etc) Posting of this notification means the application is free to
associated with the indicated &quot;object&quot;. After this free any resources (memory, files, etc) associated with the
event, the given &quot;object&quot; handle (<FONT FACE="Courier"><A HREF="#NormObjectHandle">NormObjectHandle</A></FONT>) indicated &quot;object&quot;. After this event, the given
&quot;object&quot; handle (<FONT FACE="Courier"><A HREF="#NormObjectHandle">NormObjectHandle</A></FONT>)
is no longer valid unless it is specifically retained by the is no longer valid unless it is specifically retained by the
application.</P> application.</P>
</TD> </TD>
@ -1645,7 +1658,7 @@ with no lower bound. These rate bounds apply only when congestion
control operation is enabled (see<FONT FACE="Courier"> control operation is enabled (see<FONT FACE="Courier">
<A HREF="#NormSetCongestionControl()">NormSetCongestionControl()</A></FONT>). If the current congestion <A HREF="#NormSetCongestionControl()">NormSetCongestionControl()</A></FONT>). If the current congestion
control rate falls outside of the specified bounds, the sender control rate falls outside of the specified bounds, the sender
transmission rate will</P> transmission rate will be adjusted to stay within the set bounds.</P>
<H4 CLASS="western">Return Values</H4> <H4 CLASS="western">Return Values</H4>
<P CLASS="western" STYLE="font-style: normal">This function returns <P CLASS="western" STYLE="font-style: normal">This function returns
<FONT FACE="Courier"><I>true</I></FONT> upon success. If both <FONT FACE="Courier"><I>true</I></FONT> upon success. If both
@ -1653,6 +1666,69 @@ transmission rate will</P>
are greater than or equal to zero, but (<FONT FACE="Courier"><U>rateMax</U></FONT> are greater than or equal to zero, but (<FONT FACE="Courier"><U>rateMax</U></FONT>
&lt; <FONT FACE="Courier"><U>rateMin</U></FONT>), the rate bounds &lt; <FONT FACE="Courier"><U>rateMin</U></FONT>), the rate bounds
will remain unset or unchanged and the function will return <FONT FACE="Courier"><I>false</I></FONT>.</P> will remain unset or unchanged and the function will return <FONT FACE="Courier"><I>false</I></FONT>.</P>
<H3 CLASS="functionheading-western"><A NAME="NormSetTransmitCacheBounds()">NormSetTransmitCacheBounds()</A></H3>
<H4 CLASS="western">Synopsis</H4>
<P STYLE="font-style: normal; page-break-after: avoid"><FONT FACE="Courier"><FONT SIZE=2>#include
&lt;normApi.h&gt;</FONT></FONT></P>
<P STYLE="font-style: normal; page-break-after: avoid"><A NAME="OLE_LINK1"></A>
<FONT FACE="Courier"><FONT SIZE=2>void
NormSetTransmitCacheBounds(<A HREF="#NormSessionHandle">NormSessionHandle</A>&nbsp;session,
<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<A HREF="#NormSize">NormSize</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;sizeMax,<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;unsigned
int&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;countMin,<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;unsigned
int&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;countMax);</FONT></FONT></P>
<H4 CLASS="western">Description</H4>
<P CLASS="western" STYLE="font-style: normal">This function sets
limits that define the number and total size of pending transmit
objects a NORM sender will allow to be enqueued by the application.
Setting these bounds to large values means the NORM protocol engine
will keep history and state for previously transmitted objects for a
larger interval of time (depending upon the transmission rate) when
the application is actively enqueueing additional objects in response
to NORM_TX_QUEUE_EMPTY notifications. This can allow more time for
receivers suffering degraded network conditions to make repair
requests before the sender &quot;purges&quot; older objects from its
&quot;transmit cache&quot; when new objects are enqueued. A
NORM_TX_OBJECT_PURGED notification is issued when the enqueuing of a
new transmit object causes the NORM transmit cache to overflow,
indicating the NORM sender no longer needs to reference the
designated old transmit object and the application is free to release
related resources as needed.
</P>
<P CLASS="western" STYLE="font-style: normal">The <FONT FACE="Courier"><U>sizeMax</U></FONT>
parameter sets the maximum total size, in bytes, of enqueued objects
allowed, providing the constraints of the <FONT FACE="Courier"><U>countMin</U></FONT>
and <FONT FACE="Courier"><U>countMax</U></FONT> parameters are met.
The <FONT FACE="Courier"><U>countMin</U></FONT> parameter sets the
minimum number of objects the application may enqueue, regardless of
the objects' sizes and the <FONT FACE="Courier"><U>sizeMax</U></FONT>
value. For example, the default <FONT FACE="Courier"><U>sizeMax</U></FONT>
value is 20 Mbyte and the default <FONT FACE="Courier"><U>countMin</U></FONT>
is 8, thus allowing the application to always have at least 8 pending
objects enqueued for transmission if it desires, even if their total
size is greater than 20 Mbyte. Similarly, the <FONT FACE="Courier"><U>countMax</U></FONT>
parameter sets a ceiling on how many objects may be enqueued,
regardless of their total sizes with respect to the <FONT FACE="Courier"><U>sizeMax</U></FONT>
setting. For example, the default <FONT FACE="Courier"><U>countMax</U></FONT>
value is 256, which means the application is never allowed to have
more than 256 objects pending transmission enqueued, even if they are
256 very small objects. <I>Note that </I><FONT FACE="Courier"><U><I>countMax</I></U></FONT><I>
must be greater than or equal to </I><FONT FACE="Courier"><U><I>countMin</I></U></FONT><I>
and </I><FONT FACE="Courier"><U><I>countMin</I></U></FONT><I> is
recommended to be at least two.</I></P>
<P CLASS="western" STYLE="font-style: normal">Note that in the case
of NORM_OBJECT_FILE objects, some operating systems impose limits
(e.g. 256) on how many open files a process may have at one time and
it may be appropriate to limit the <FONT FACE="Courier"><U>countMax</U></FONT>
value accordingly. In other cases, a large <FONT FACE="Courier"><U>countMin</U></FONT>
or <FONT FACE="Courier"><U>countMax</U></FONT> may be desired to
allow the NORM sender to act as virtual cache of files or other data
available for reliable transmission. Future iterations of the NRL
NORM implementation may support alternative NORM receiver &quot;group
join&quot; policies that would allow the receivers to request
transmission of cached content.</P>
<H4 CLASS="western">Return Values</H4>
<P CLASS="western" STYLE="font-style: normal">This function has no
return value.</P>
<H3 CLASS="functionheading-western"><A NAME="NormSetAutoParity()">NormSetAutoParity()</A></H3> <H3 CLASS="functionheading-western"><A NAME="NormSetAutoParity()">NormSetAutoParity()</A></H3>
<H4 CLASS="western">Synopsis</H4> <H4 CLASS="western">Synopsis</H4>
<P STYLE="font-style: normal; page-break-after: avoid"><FONT FACE="Courier"><FONT SIZE=2>#include <P STYLE="font-style: normal; page-break-after: avoid"><FONT FACE="Courier"><FONT SIZE=2>#include

BIN
NormDeveloperGuide.pdf
View File

Binary file not shown.

BIN
NormUserGuide.pdf Normal file
View File

Binary file not shown.

10
VERSION.TXT
View File

@ -1,5 +1,15 @@
NORM Version History NORM Version History
Version 1.3b4
=============
- Added NormSetTxCacheBounds(), see NormDevGuide for details
- Fixed issue with NormStreamSeekMsgStart() that crept in
somehow (Thanks to Jody Hagins for finding it).
- Added code to check that NormFileEnqueue() argument is
actually a file and not a directory name (Thanks to
Charlie Shyr for finding this)
- Fixed NormSession::Open() so that IPv6 works
Version 1.3b3 Version 1.3b3
============= =============
- Added NORM_TX_FLUSH_COMPLETE notification so the sender app - Added NORM_TX_FLUSH_COMPLETE notification so the sender app

15
common/normApi.cpp
View File

@ -933,6 +933,21 @@ void NormSetTransmitRateBounds(NormSessionHandle sessionHandle,
} }
} // end NormSetTransmitRateBounds() } // end NormSetTransmitRateBounds()
void NormSetTransmitCacheBounds(NormSessionHandle sessionHandle,
NormSize sizeMax,
unsigned long countMin,
unsigned long countMax)
{
NormInstance* instance = NormInstance::GetInstanceFromSession(sessionHandle);
if (instance && instance->dispatcher.SuspendThread())
{
NormSession* session = (NormSession*)sessionHandle;
NormObjectSize theSize(sizeMax);
if (session) session->SetTxCacheBounds(theSize, countMin, countMax);
instance->dispatcher.ResumeThread();
}
} // end NormSetTransmitCacheBounds()
void NormSetAutoParity(NormSessionHandle sessionHandle, unsigned char autoParity) void NormSetAutoParity(NormSessionHandle sessionHandle, unsigned char autoParity)
{ {
NormInstance* instance = NormInstance::GetInstanceFromSession(sessionHandle); NormInstance* instance = NormInstance::GetInstanceFromSession(sessionHandle);

6
common/normApi.h
View File

@ -171,7 +171,6 @@ void NormSetMessageTrace(NormSessionHandle sessionHandle, bool state);
void NormSetTxLoss(NormSessionHandle sessionHandle, double percent); void NormSetTxLoss(NormSessionHandle sessionHandle, double percent);
void NormSetRxLoss(NormSessionHandle sessionHandle, double percent); void NormSetRxLoss(NormSessionHandle sessionHandle, double percent);
/** NORM Sender Functions */ /** NORM Sender Functions */
bool NormStartSender(NormSessionHandle sessionHandle, bool NormStartSender(NormSessionHandle sessionHandle,
@ -196,6 +195,11 @@ void NormSetTransmitRateBounds(NormSessionHandle sessionHandle,
double rateMin, double rateMin,
double rateMax); double rateMax);
void NormSetTransmitCacheBounds(NormSessionHandle sessionHandle,
NormSize sizeMax,
unsigned long countMin,
unsigned long countMax);
void NormSetAutoParity(NormSessionHandle sessionHandle, void NormSetAutoParity(NormSessionHandle sessionHandle,
unsigned char autoParity); unsigned char autoParity);

9
common/normApp.cpp
View File

@ -12,11 +12,12 @@
#ifdef UNIX #ifdef UNIX
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> // for "waitpid()" #include <sys/wait.h> // for "waitpid()"
#include <signal.h>
#else #else
#ifndef _WIN32_WCE #ifndef _WIN32_WCE
#include <io.h> // for _mktmp() #include <io.h> // for _mktmp()
#endif // _WIN32-WCE #endif // _WIN32-WCE
#endif // UNIX #endif // if/else UNIX/WIN32
// Command-line application using Protolib EventDispatcher // Command-line application using Protolib EventDispatcher
class NormApp : public NormController, public ProtoApp class NormApp : public NormController, public ProtoApp
@ -142,7 +143,7 @@ NormApp::NormApp()
tx_buffer_size(1024*1024), tx_buffer_size(1024*1024),
tx_object_interval(0.0), tx_repeat_count(0), tx_repeat_interval(2.0), tx_repeat_clear(true), tx_object_interval(0.0), tx_repeat_count(0), tx_repeat_interval(2.0), tx_repeat_clear(true),
rx_buffer_size(1024*1024), rx_sock_buffer_size(0), rx_buffer_size(1024*1024), rx_sock_buffer_size(0),
rx_cache_path(NULL), unicast_nacks(false), silent_client(false), rx_cache_path(NULL), post_processor(NULL), unicast_nacks(false), silent_client(false),
tracing(false), tx_loss(0.0), rx_loss(0.0) tracing(false), tx_loss(0.0), rx_loss(0.0)
{ {
@ -166,7 +167,7 @@ NormApp::~NormApp()
if (address) delete[] address; if (address) delete[] address;
if (interface_name) delete[] interface_name; if (interface_name) delete[] interface_name;
if (rx_cache_path) delete[] rx_cache_path; if (rx_cache_path) delete[] rx_cache_path;
if (post_processor) delete[] post_processor; if (post_processor) delete post_processor;
} }
// NOTE on message flushing mode: // NOTE on message flushing mode:
@ -353,7 +354,7 @@ bool NormApp::OnCommand(const char* cmd, const char* val)
len = strlen(buffer); len = strlen(buffer);
len = (len > 8191) ? 8191 : len; len = (len > 8191) ? 8191 : len;
buffer[len++] = '\0'; buffer[len++] = '\0';
if (!control_pipe.Send(buffer, (unsigned int)len)) if (!control_pipe.Send(buffer, (unsigned int&)len))
{ {
DMSG(0, "NormApp::OnCommand() error sending command to remote instance\n"); DMSG(0, "NormApp::OnCommand() error sending command to remote instance\n");
return false; return false;

49
common/normObject.cpp
View File

@ -214,7 +214,6 @@ void NormObject::Close()
NormObjectSize NormObject::GetBytesPending() const NormObjectSize NormObject::GetBytesPending() const
{ {
NormObjectSize bytesCompleted;
NormBlockId nextId; NormBlockId nextId;
if (GetFirstPending(nextId)) if (GetFirstPending(nextId))
{ {
@ -1796,7 +1795,7 @@ bool NormFileObject::Open(const char* thePath,
} }
else else
{ {
if (file.Open(thePath, O_RDWR | O_CREAT | O_TRUNC)) if (file.Open(thePath, O_WRONLY | O_CREAT | O_TRUNC))
{ {
file.Lock(); file.Lock();
} }
@ -1806,15 +1805,21 @@ bool NormFileObject::Open(const char* thePath,
return false; return false;
} }
} }
//block_size = NormObjectSize(server->BlockSize()) *
// NormObjectSize(server->SegmentSize());
} }
else else
{ {
// Verify that it _is_ a file
if (NormFile::NORMAL != NormFile::GetType(thePath))
{
DMSG(0, "NormFileObject::Open() send file \"%s\" is not a file "
"(a directory perhaps?)\n", thePath);
return false;
}
// We're sending this file // We're sending this file
if (file.Open(thePath, O_RDONLY)) if (file.Open(thePath, O_RDONLY))
{ {
NormObjectSize::Offset size = file.GetSize(); NormObjectSize::Offset size = file.GetSize();
if (size) if (size)
{ {
if (!NormObject::Open(NormObjectSize(size), if (!NormObject::Open(NormObjectSize(size),
@ -2576,6 +2581,8 @@ bool NormStreamObject::WriteSegment(NormBlockId blockId,
read_index.block = blockId; read_index.block = blockId;
read_index.segment = segmentId; read_index.segment = segmentId;
read_offset = segmentOffset; read_offset = segmentOffset;
TRACE("norm stream read init read_index.segment:%hu read_offset:%lu\n",
read_index.segment, read_offset);
} }
if ((blockId < read_index.block) || if ((blockId < read_index.block) ||
@ -2742,13 +2749,16 @@ void NormStreamObject::Prune(NormBlockId blockId)
} // end NormStreamObject::Prune() } // end NormStreamObject::Prune()
// Sequential (in order) read/write routines (TBD) Add a "Seek()" method // Sequential (in order) read/write routines (TBD) Add a "Seek()" method
bool NormStreamObject::Read(char* buffer, unsigned int* buflen, bool findMsgStart) bool NormStreamObject::Read(char* buffer, unsigned int* buflen, bool seekMsgStart)
{ {
SetDebugLevel(4);
TRACE("NormStreamObject::Read(seekMsgStart:%d) read_offset:%lu\n", seekMsgStart, read_offset);
if (stream_closing) if (stream_closing)
{ {
DMSG(4, "NormStreamObject::Read() attempted to read from closed stream\n"); DMSG(4, "NormStreamObject::Read() attempted to read from closed stream\n");
*buflen = 0; *buflen = 0;
return true; TRACE("return 1\n");
return seekMsgStart ? false : true;
} }
Retain(); Retain();
SetNotifyOnUpdate(true); // reset notification when streams are read SetNotifyOnUpdate(true); // reset notification when streams are read
@ -2756,14 +2766,16 @@ bool NormStreamObject::Read(char* buffer, unsigned int* buflen, bool findMsgStar
unsigned int bytesToRead = *buflen; unsigned int bytesToRead = *buflen;
do do
{ {
TRACE("do top ...\n");
NormBlock* block = stream_buffer.Find(read_index.block); NormBlock* block = stream_buffer.Find(read_index.block);
if (!block) if (!block)
{ {
// DMSG(0, "NormStreamObject::Read() stream buffer empty (1) (sbEmpty:%d)\n", stream_buffer.IsEmpty()); DMSG(0, "NormStreamObject::Read() stream buffer empty (1) (sbEmpty:%d)\n", stream_buffer.IsEmpty());
*buflen = bytesRead; *buflen = bytesRead;
if (bytesRead > 0) if (bytesRead > 0)
{ {
Release(); Release();
TRACE("return 2\n");
return true; return true;
} }
else else
@ -2782,7 +2794,8 @@ bool NormStreamObject::Read(char* buffer, unsigned int* buflen, bool findMsgStar
else else
{ {
Release(); Release();
return findMsgStart ? false : true; TRACE("return 3\n");
return seekMsgStart ? false : true;
} }
} }
} }
@ -2792,12 +2805,13 @@ bool NormStreamObject::Read(char* buffer, unsigned int* buflen, bool findMsgStar
if (!segment) if (!segment)
{ {
//DMSG(0, "NormStreamObject::Read(%lu:%hu) stream buffer empty (2)\n", DMSG(0, "NormStreamObject::Read(%lu:%hu) stream buffer empty (2)\n",
// (UINT32)read_index.block, read_index.segment); (UINT32)read_index.block, read_index.segment);
*buflen = bytesRead; *buflen = bytesRead;
if (bytesRead > 0) if (bytesRead > 0)
{ {
Release(); Release();
TRACE("return 4\n");
return true; return true;
} }
else else
@ -2819,7 +2833,8 @@ bool NormStreamObject::Read(char* buffer, unsigned int* buflen, bool findMsgStar
else else
{ {
Release(); Release();
return findMsgStart ? false : true; TRACE("return 5\n");
return seekMsgStart ? false : true;
} }
} }
} }
@ -2855,7 +2870,7 @@ bool NormStreamObject::Read(char* buffer, unsigned int* buflen, bool findMsgStar
UINT16 count = length - index; UINT16 count = length - index;
count = MIN(count, bytesToRead); count = MIN(count, bytesToRead);
if (findMsgStart) if (seekMsgStart)
{ {
if ((0 != index) || if ((0 != index) ||
!NormDataMsg::StreamPayloadFlagIsSet(segment, NormDataMsg::FLAG_MSG_START)) !NormDataMsg::StreamPayloadFlagIsSet(segment, NormDataMsg::FLAG_MSG_START))
@ -2882,8 +2897,13 @@ bool NormStreamObject::Read(char* buffer, unsigned int* buflen, bool findMsgStar
read_index.segment = 0; read_index.segment = 0;
Prune(read_index.block); Prune(read_index.block);
} }
TRACE("continue ...\n");
continue; continue;
} }
else
{
seekMsgStart = false;
}
} }
#ifdef SIMULATE #ifdef SIMULATE
@ -2924,9 +2944,10 @@ bool NormStreamObject::Read(char* buffer, unsigned int* buflen, bool findMsgStar
server->DeleteObject(this); server->DeleteObject(this);
} }
} }
} while (bytesToRead > 0); // end while (len > 0) } while ((bytesToRead > 0) || seekMsgStart); // end while (len > 0)
*buflen = bytesRead; *buflen = bytesRead;
Release(); Release();
TRACE("return 7\n");
return true; return true;
} // end NormStreamObject::Read() } // end NormStreamObject::Read()

2
common/normPostProcess.cpp
View File

@ -70,7 +70,7 @@ bool NormPostProcessor::SetCommand(const char* cmd)
} }
// 2) Count the number of tokens // 2) Count the number of tokens
if (!cmd) return true; // post processing disabled if (NULL == cmd) return true; // post processing disabled
if (!strcmp(cmd, "none")) return SetCommand(NULL); if (!strcmp(cmd, "none")) return SetCommand(NULL);
const char* ptr = cmd; const char* ptr = cmd;
unsigned int argCount = 0; unsigned int argCount = 0;

28
common/normSession.cpp
View File

@ -94,7 +94,7 @@ bool NormSession::Open(const char* interfaceName)
{ {
if (address.GetPort() != tx_port) if (address.GetPort() != tx_port)
{ {
if (!tx_socket->Open(tx_port)) if (!tx_socket->Open(tx_port, address.GetType()))
{ {
DMSG(0, "NormSession::Open() tx_socket open error\n"); DMSG(0, "NormSession::Open() tx_socket open error\n");
return false; return false;
@ -107,7 +107,7 @@ bool NormSession::Open(const char* interfaceName)
} }
if (!rx_socket.IsOpen()) if (!rx_socket.IsOpen())
{ {
if (!rx_socket.Open(address.GetPort())) if (!rx_socket.Open(address.GetPort(), address.GetType()))
{ {
DMSG(0, "NormSession::Open() rx_socket open error\n"); DMSG(0, "NormSession::Open() rx_socket open error\n");
Close(); Close();
@ -1044,6 +1044,30 @@ void NormSession::DeleteTxObject(NormObject* obj)
obj->Release(); obj->Release();
} // end NormSession::DeleteTxObject() } // end NormSession::DeleteTxObject()
void NormSession::SetTxCacheBounds(NormObjectSize sizeMax,
unsigned long countMin,
unsigned long countMax)
{
tx_cache_size_max = sizeMax;
tx_cache_count_min = (countMin < countMax) ? countMin : countMax;
tx_cache_count_max = (countMax > countMin) ? countMax : countMin;
// Now trim the tx_table as needed
if (IsServer())
{
unsigned long count = tx_table.Count();
while ((count >= tx_cache_count_min) &&
((count >= tx_cache_count_max) ||
(tx_table.GetSize() > tx_cache_size_max)))
{
// Remove oldest non-pending
NormObject* oldest = tx_table.Find(tx_table.RangeLo());
Notify(NormController::TX_OBJECT_PURGED, (NormServerNode*)NULL, oldest);
DeleteTxObject(oldest);
count = tx_table.Count();
}
}
} // end NormSession::SetTxCacheBounds()
NormBlock* NormSession::ServerGetFreeBlock(NormObjectId objectId, NormBlock* NormSession::ServerGetFreeBlock(NormObjectId objectId,
NormBlockId blockId) NormBlockId blockId)
{ {

4
common/normSession.h
View File

@ -136,7 +136,9 @@ class NormSession
bool CongestionControl() {return cc_enable;} bool CongestionControl() {return cc_enable;}
void SetCongestionControl(bool state) {cc_enable = state;} void SetCongestionControl(bool state) {cc_enable = state;}
void SetTxRateBounds(double rateMin, double rateMax); void SetTxRateBounds(double rateMin, double rateMax);
void SetTxCacheBounds(NormObjectSize sizeMax,
unsigned long countMin,
unsigned long countMax);
void Notify(NormController::Event event, void Notify(NormController::Event event,
class NormServerNode* server, class NormServerNode* server,
class NormObject* object) class NormObject* object)

2
common/normTest.cpp
View File

@ -15,7 +15,7 @@
#endif // UNIX #endif // UNIX
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
printf("normTest starting (sizeof(NormOffset) = %d)...\n", sizeof(NormOffset)); printf("normTest starting (sizeof(NormSize) = %d)...\n", sizeof(NormSize));
NormInstanceHandle instance = NormCreateInstance(); NormInstanceHandle instance = NormCreateInstance();

2
common/normVersion.h
View File

@ -32,6 +32,6 @@
#ifndef _NORM_VERSION #ifndef _NORM_VERSION
#define _NORM_VERSION #define _NORM_VERSION
#define VERSION "1.3b3" #define VERSION "1.3b4"
#endif // _NORM_VERSION #endif // _NORM_VERSION

10
examples/normFileRecv.cpp
View File

@ -7,11 +7,12 @@
BUILD (Unix): BUILD (Unix):
g++ -o normRecvFile normRecvFile.cpp -I../common/ -I../protolib/common \ g++ -o normFileSend normFileSend.cpp -D_FILE_OFFSET_BITS=64 -DPROTO_DEBUG \
-DPROTO_DEBUG ../unix/libnorm.a ../protolib/unix/libProtokit.a -lpthread -I../common/ -I../protolib/common ../unix/libnorm.a \
../protolib/unix/libProtokit.a -lpthread
(for MacOS/BSD, add "-lresolv") (for MacOS/BSD, add "-lresolv")
(for Solaris, add "-ldl -lnsl -lsocket -lresolv") (for Solaris, add "-lnsl -lsocket -lresolv")
******************************************************************************/ ******************************************************************************/
@ -126,10 +127,11 @@ int main(int argc, char* argv[])
// only calculate/post updates occasionally rather than for // only calculate/post updates occasionally rather than for
// each and every RX_OBJECT_UPDATE event) // each and every RX_OBJECT_UPDATE event)
NormSize objectSize = NormObjectGetSize(theEvent.object); NormSize objectSize = NormObjectGetSize(theEvent.object);
fprintf(stderr, "sizeof(NormSize) = %d\n", sizeof(NormSize));
NormSize completed = objectSize - NormObjectGetBytesPending(theEvent.object); NormSize completed = objectSize - NormObjectGetBytesPending(theEvent.object);
double percentComplete = 100.0 * ((double)completed/(double)objectSize); double percentComplete = 100.0 * ((double)completed/(double)objectSize);
fprintf(stderr, "normFileRecv: completion status %lu/%lu (%3.0lf%%)\n", fprintf(stderr, "normFileRecv: completion status %lu/%lu (%3.0lf%%)\n",
completed, objectSize, percentComplete); (unsigned long)completed, (unsigned long)objectSize, percentComplete);
break; break;
} }

11
examples/normFileSend.cpp
View File

@ -7,11 +7,12 @@
BUILD (Unix): BUILD (Unix):
g++ -o normFileSend normFileSend.cpp -I../common/ -I../protolib/common \ g++ -o normFileSend normFileSend.cpp -D_FILE_OFFSET_BITS=64 -I../common/ \
../unix/libnorm.a ../protolib/unix/libProtokit.a -lpthread -I../protolib/common ../unix/libnorm.a ../protolib/unix/libProtokit.a \
-lpthread
(for MacOS/BSD, add "-lresolv") (for MacOS/BSD, add "-lresolv")
(for Solaris, add "-ldl -lnsl -lsocket -lresolv") (for Solaris, add "-lnsl -lsocket -lresolv")
******************************************************************************/ ******************************************************************************/
@ -24,7 +25,7 @@
#include "normApi.h" // for NORM API #include "normApi.h" // for NORM API
#include "protoDefs.h" // for ProtoSystemTime #include "protoDefs.h" // for ProtoSystemTime()
#include "protoDebug.h" // for SetDebugLevel(), etc #include "protoDebug.h" // for SetDebugLevel(), etc
#include <stdio.h> // for printf(), etc #include <stdio.h> // for printf(), etc
@ -70,7 +71,7 @@ int main(int argc, char* argv[])
// (Need to include "protolib/common/protoDebug.h" for this // (Need to include "protolib/common/protoDebug.h" for this
//SetDebugLevel(2); //SetDebugLevel(2);
// Uncomment to turn on debug NORM message tracing // Uncomment to turn on debug NORM message tracing
//NormSetMessageTrace(session, true); NormSetMessageTrace(session, true);
// Uncomment to turn on some random packet loss // Uncomment to turn on some random packet loss
// NormSetTxLoss(session, 10.0); // 10% packet loss // NormSetTxLoss(session, 10.0); // 10% packet loss
struct timeval currentTime; struct timeval currentTime;

1
unix/unixPostProcess.cpp
View File

@ -101,7 +101,6 @@ class UnixPostProcessor : public NormPostProcessor
#endif // NETSCAPE_SUPPORT #endif // NETSCAPE_SUPPORT
}; // end class UnixPostProcessor }; // end class UnixPostProcessor
UnixPostProcessor::UnixPostProcessor() UnixPostProcessor::UnixPostProcessor()
: process_id(0) : process_id(0)
#ifdef NETSCAPE_SUPPORT #ifdef NETSCAPE_SUPPORT

BIN
win32/Norm.suo
View File

Binary file not shown.