convert JArray ctor back to minSize, to avoid upgrade confusion

libj2dplot/code/J2DPlotFunctionBase.cpp

@@ -12,6 +12,8 @@
 #include <jx-af/jcore/JMinMax.h>
 #include <jx-af/jcore/jAssert.h>
 
+const JSize kDefSampleCount = 100;	// # of points for approximating y range
+
 /*********************************************************************************
  Constructor
 
@@ -31,7 +33,7 @@ J2DPlotFunctionBase::J2DPlotFunctionBase
 	itsXMin = JMin(xMin, xMax);
 	itsXMax = JMax(xMin, xMax);
 
-	itsValues = jnew JArray<Point>(7);
+	itsValues = jnew JArray<Point>(kDefSampleCount);
 	ListenTo(itsPlot);
 }
 
@@ -109,8 +111,7 @@ J2DPlotFunctionBase::GetYRange
 	const
 {
 	const JSize pointCount = itsPlot->GetSmoothSteps();
-	JArray<Point> list;
-	list.SetMinSize(pointCount);
+	JArray<Point> list(pointCount);
 	EvaluateFunction(xMin, xMax, xLinear, pointCount, &list);
 
 	*yMin = *yMax = 0.0;

libj2dplot/code/J2DVectorData.cpp

@@ -11,6 +11,8 @@
 #include <jx-af/jcore/JMinMax.h>
 #include <jx-af/jcore/jAssert.h>
 
+const JSize kDefSampleCount = 100;
+
 /*********************************************************************************
  Constructor function (static)
 
@@ -69,10 +71,10 @@ J2DVectorData::J2DVectorData()
 {
 	J2DVectorDataX();
 
-	itsXData  = jnew JArray<JFloat>(7);
-	itsYData  = jnew JArray<JFloat>(7);
-	itsVXData = jnew JArray<JFloat>(7);
-	itsVYData = jnew JArray<JFloat>(7);
+	itsXData  = jnew JArray<JFloat>(kDefSampleCount);
+	itsYData  = jnew JArray<JFloat>(kDefSampleCount);
+	itsVXData = jnew JArray<JFloat>(kDefSampleCount);
+	itsVYData = jnew JArray<JFloat>(kDefSampleCount);
 
 	itsIsListeningFlag = false;
 }

libj2dplot/code/JX2DCurveNameList.cpp

@@ -54,7 +54,7 @@ JX2DCurveNameList::JX2DCurveNameList
 
 	const JSize count = curveInfo.GetItemCount();
 
-	itsNameList = jnew JPtrArray<JString>(JPtrArrayT::kForgetAll);
+	itsNameList = jnew JPtrArray<JString>(JPtrArrayT::kForgetAll, count);
 
 	AppendRows(count);
 	for (JIndex i=1; i<=count; i++)

libjcore/code/JAliasArray.tmpl

@@ -44,7 +44,8 @@ JAliasArray<T>::JAliasArray
 {
 	assert( itsData != nullptr );
 
-	itsIndexArray = jnew JArray<JIndex>(data->GetMinLgSize());
+	itsIndexArray = jnew JArray<JIndex>;
+	itsIndexArray->SetMinLgSize(data->GetMinLgSize());
 	itsIndexArray->SetSortOrder(order);
 
 	SetCompareFunction(compareFn);

libjcore/code/JArray.h

@@ -18,7 +18,7 @@ class JArray : public JList<T>
 {
 public:
 
-	JArray(const JSize minLgSize = 0);
+	JArray(const JSize minSize = 0);
 	JArray(const JArray<T>& source);
 	JArray(JArray<T>&& dyingSource) noexcept;
 

libjcore/code/JArray.tmpl

@@ -25,6 +25,7 @@
 #include "JArray.h"
 #include "JMinMax.h"
 #include "jMath.h"
+#include <bit>
 #include <string.h>		// for memcpy,memmove
 #include <stdlib.h>		// for qsort
 // we are included by jAssert.h
@@ -38,7 +39,7 @@ inline JSize jArrayLgToSize(const JSize lgSize)
 
 inline JSize jArraySizeToLg(const JSize count)
 {
-	return JLCeil(std::log2(count+1));
+	return std::bit_width(count);
 }
 
 /******************************************************************************
@@ -49,15 +50,13 @@ inline JSize jArraySizeToLg(const JSize count)
 template <class T>
 JArray<T>::JArray
 	(
-	const JSize minLgSize
+	const JSize minSize
 	)
 	:
 	JList<T>(),
-	itsLgSize(JMax(kJArrayDefaultMinLgSize, minLgSize)),
+	itsLgSize(JMax(kJArrayDefaultMinLgSize, jArraySizeToLg(minSize))),
 	itsMinLgSize(itsLgSize)
 {
-	assert( itsMinLgSize < 12 );
-
 	itsItems = jnew T [ jArrayLgToSize(itsLgSize) ];
 }
 
@@ -275,7 +274,7 @@ JArray<T>::CreateItem
 {
 	assert( index > 0 );
 
-	const JSize newLgSize = JMax(itsMinLgSize, jArraySizeToLg(this->GetItemCount()));
+	const JSize newLgSize = JMax(itsMinLgSize, jArraySizeToLg(this->GetItemCount() + 1));
 	if (newLgSize > itsLgSize)
 	{
 		ResizeMemoryAllocation(newLgSize);

libjcore/code/JAsynchDataReceiver.h

@@ -21,7 +21,7 @@ class JAsynchDataReceiverT
 
 	enum
 	{
-		kDefaultLgBufferSize = 16
+		kDefaultBufferSize = 65536
 	};
 
 public:

libjcore/code/JAsynchDataReceiver.tmpl

@@ -25,7 +25,7 @@ template <ACE_PEER_STREAM_1>
 JAsynchDataReceiver<ACE_PEER_STREAM_2>::JAsynchDataReceiver()
 	:
 	ACE_Svc_Handler<ACE_PEER_STREAM_2,ACE_SYNCH>(),
-	itsByteBuffer(JAsynchDataReceiverT::kDefaultLgBufferSize)
+	itsByteBuffer(JAsynchDataReceiverT::kDefaultBufferSize)
 {
 	JAsynchDataReceiverX();
 }
@@ -37,7 +37,7 @@ JAsynchDataReceiver<ACE_PEER_STREAM_2>::JAsynchDataReceiver
 	)
 	:
 	ACE_Svc_Handler<ACE_PEER_STREAM_2,ACE_SYNCH>(),
-	itsByteBuffer(JAsynchDataReceiverT::kDefaultLgBufferSize)
+	itsByteBuffer(JAsynchDataReceiverT::kDefaultBufferSize)
 {
 	JAsynchDataReceiverX();
 
@@ -51,7 +51,7 @@ template <ACE_PEER_STREAM_1>
 void
 JAsynchDataReceiver<ACE_PEER_STREAM_2>::JAsynchDataReceiverX()
 {
-	itsRecvBufferSize = 1UL << JAsynchDataReceiverT::kDefaultLgBufferSize;
+	itsRecvBufferSize = JAsynchDataReceiverT::kDefaultBufferSize;
 	itsRecvBuffer     = jnew JUtf8Byte [ itsRecvBufferSize ];
 	itsCancelTaskFlag = nullptr;
 }

libjcore/code/JCoreLibVersion.h

@@ -44,15 +44,8 @@ static const char* kCurrentJCoreLibVersionStr = "4.2.0";
 //		Fixed bug so original selection is fully cleared after undo/redo.
 //	JArray:
 //		Switched to an exponential reallocation model.
-//		*** Ctor now takes log2(minimum allocation size).
 //	JStyledText:
-//		*** SetBlockSizes() now takes lgSize for both arguments.
-//	JRunArray:
-//		*** Ctor now takes log2(minimum allocation size).
-//	JPtrArray:
-//		*** Ctor now takes log2(minimum allocation size).
-//	JUtf8ByteBuffer:
-//		*** Ctor now takes log2(minimum allocation size).
+//		Renamed SetBlockSizes() to SetLgMinSizes().
 
 // version 4.1.0:
 //

libjcore/code/JMMArrayTable.cpp

@@ -16,6 +16,8 @@
 #include "JMMRecord.h"
 #include "jAssert.h"
 
+	const JSize blockSize = 5000;
+
 /******************************************************************************
  Constructor
 
@@ -34,11 +36,11 @@ JMMArrayTable::JMMArrayTable
 	itsDeletedCount(0),
 	itsSnapshotID(0)
 {
-	itsAllocatedTable = jnew JArray<JMMRecord>(12);
+	itsAllocatedTable = jnew JArray<JMMRecord>(blockSize);
 
 	if (recordDelete)
 	{
-		itsDeletedTable = jnew JArray<JMMRecord>(12);
+		itsDeletedTable = jnew JArray<JMMRecord>(blockSize);
 	}
 }
 

libjcore/code/JMessageProtocol.tmpl

@@ -41,6 +41,7 @@ JMessageProtocol<ACE_PEER_STREAM_2>::JMessageProtocol
 	)
 	:
 	JNetworkProtocolBase<ACE_PEER_STREAM_2>(synchSend),
+	itsByteBuffer(JMessageProtocolT::kDefaultBufferSize),
 	itsMessageList(JPtrArrayT::kDeleteAll),
 	itsSeparatorStr(JString::kDoNotNormalize),
 	itsDisconnectStr(JString::kDoNotNormalize)
@@ -56,6 +57,7 @@ JMessageProtocol<ACE_PEER_STREAM_2>::JMessageProtocol
 	)
 	:
 	JNetworkProtocolBase<ACE_PEER_STREAM_2>(synchSend),
+	itsByteBuffer(JMessageProtocolT::kDefaultBufferSize),
 	itsMessageList(JPtrArrayT::kDeleteAll),
 	itsSeparatorStr(JString::kDoNotNormalize),
 	itsDisconnectStr(JString::kDoNotNormalize)

libjcore/code/JPtrArray.h

@@ -22,7 +22,7 @@ class JPtrArray : public JArray<T*>
 {
 public:
 
-	JPtrArray(const JPtrArrayT::CleanUpAction action, const JSize minLgSize = 0);
+	JPtrArray(const JPtrArrayT::CleanUpAction action, const JSize minSize = 0);
 	JPtrArray(const JPtrArray<T>& source, const JPtrArrayT::CleanUpAction action);
 	JPtrArray(JPtrArray<T>&& dyingSource) noexcept;
 
@@ -95,7 +95,7 @@ class JDCCPtrArray : public JPtrArray<T>
 {
 public:
 
-	JDCCPtrArray(const JPtrArrayT::CleanUpAction action, const JSize minLgSize = 0);
+	JDCCPtrArray(const JPtrArrayT::CleanUpAction action, const JSize minSize = 0);
 	JDCCPtrArray(const JPtrArray<T>& source, const JPtrArrayT::CleanUpAction action);
 };
 

libjcore/code/JPtrArray.tmpl

@@ -37,10 +37,10 @@ template <class T>
 JPtrArray<T>::JPtrArray
 	(
 	const JPtrArrayT::CleanUpAction	action,
-	const JSize						minLgSize
+	const JSize						minSize
 	)
 	:
-	JArray<T*>(minLgSize),
+	JArray<T*>(minSize),
 	itsCleanUpAction(action)
 {
 }
@@ -91,10 +91,10 @@ template <class T>
 JDCCPtrArray<T>::JDCCPtrArray
 	(
 	const JPtrArrayT::CleanUpAction	action,
-	const JSize						minLgSize
+	const JSize						minSize
 	)
 	:
-	JPtrArray<T>(action, minLgSize)
+	JPtrArray<T>(action, minSize)
 {
 }
 

libjcore/code/JRunArray.h

@@ -45,7 +45,7 @@ class JRunArray : public JList<T>
 
 public:
 
-	JRunArray(const JSize minLgSize = 0);
+	JRunArray(const JSize minSize = 0);
 	JRunArray(const JRunArray<T>& source);
 	JRunArray(const JRunArray<T>& source, const JIndexRange& range);
 

libjcore/code/JRunArray.tmpl

@@ -36,12 +36,12 @@
 template <class T>
 JRunArray<T>::JRunArray
 	(
-	const JSize minLgSize
+	const JSize minSize
 	)
 	:
 	JList<T>()
 {
-	itsRuns = jnew JArray< JRunArrayItem<T> >(minLgSize);
+	itsRuns = jnew JArray< JRunArrayItem<T> >(minSize);
 }
 
 /******************************************************************************
@@ -67,7 +67,8 @@ JRunArray<T>::JRunArray
 	const JIndexRange&	range
 	)
 {
-	itsRuns = jnew JArray< JRunArrayItem<T> >(source.itsRuns->GetMinLgSize());
+	itsRuns = jnew JArray< JRunArrayItem<T> >;
+	itsRuns->SetMinLgSize(source.itsRuns->GetMinLgSize());
 
 	JIndex runIndex = 1, firstIndexInRun = 1;
 	IteratorInsertSlice(1, source, range, &runIndex, &firstIndexInRun);

libjcore/code/JSTStyler.cpp

@@ -62,7 +62,7 @@ using TextCount = JStyledText::TextCount;
 using TextRange = JStyledText::TextRange;
 
 const JSize kDecimationFactor = 50;
-const JSize kMinLgListSize    = 7;
+const JSize kMinListSize      = 50;
 
 #define DEBUG_TIMING_INFO	0	// boolean
 
@@ -416,7 +416,7 @@ JSTStyler::SetStyle
 JArray<JSTStyler::TokenData>*
 JSTStyler::NewTokenStartList()
 {
-	auto* list = jnew JArray<TokenData>(kMinLgListSize);
+	auto* list = jnew JArray<TokenData>(kMinListSize);
 	list->SetSortOrder(JListT::kSortAscending);
 	list->SetCompareFunction(CompareTokenStarts);
 	return list;