- Cleanup the /lib directory, by putting more 3rd-party libs in /3rdparty, and by creating a new directory called /sdk where libraries which emulate the ones in the WDK are present (Such as uuid, nt, crt, etc).

- Removed lib/interlck and lib/string.
- Removed math routines from lib/rtl.
- Created a new library called libcntpr which is what NT/WDK use when compiling the kernel/system libraries. This is an "NT-Private" version of the CRT which is supposed to contain what we had in lib/string and lib/rtl.

svn path=/trunk/; revision=26095

reactos/base/applications/cmdutils/more/more.c

@@ -1,169 +1,139 @@
-/* $Id$
- * 
- * MORE.C - external command.
- *
- * clone from 4nt more command
- *
- * 26 Sep 1999 - Paolo Pantaleo <paolopan@freemail.it>
- *     started
- * Oct 2003 - Timothy Schepens <tischepe at fastmail dot fm>
- *     use window size instead of buffer size.
- */
+#include <stdlib.h>
+#include <stdio.h>
+#include <time.h>
+#include <unistd.h>
 
-#include <windows.h>
-#include <malloc.h>
-#include <tchar.h>
+#define rdtscll(val) __asm__ __volatile__ ("rdtsc" : "=A" (val))
 
+const int SELECTMODE = 14;
+const int BIGDATA = 10000; // Relying on int = long
+const int MHZ = 2160;
+int *data;
 
-DWORD len;
-LPTSTR msg = _T("--- continue ---");
-
-
-/*handle for file and console*/
-HANDLE hStdIn;
-HANDLE hStdOut;
-HANDLE hStdErr;
-HANDLE hKeyboard;
-
-
-static VOID
-GetScreenSize (PSHORT maxx, PSHORT maxy)
-{
-	CONSOLE_SCREEN_BUFFER_INFO csbi;
-
-	GetConsoleScreenBufferInfo (hStdOut, &csbi);
-		*maxx = (csbi.srWindow.Right - csbi.srWindow.Left) + 1;
-		*maxy = (csbi.srWindow.Bottom  - csbi.srWindow.Top) - 4;
-
+void SelectionSort(int data[], int left, int right) {
+    int i, j;
+	for(i = left; i < right; i++) {
+		int min = i;
+		for(j=i+1; j <= right; j++)
+			if(data[j] < data[min]) min = j;
+		int temp = data[min];
+		data[min] = data[i];
+		data[i] = temp;
+	}
 }
 
-
-static
-VOID ConOutPuts (LPTSTR szText)
+int Partition( int d[], int left, int right)
 {
-	DWORD dwWritten;
-
-	WriteFile (GetStdHandle (STD_OUTPUT_HANDLE), szText, _tcslen(szText), &dwWritten, NULL);
-	WriteFile (GetStdHandle (STD_OUTPUT_HANDLE), "\n", 1, &dwWritten, NULL);
-}
-
-
-static VOID
-ConInKey (VOID)
-{
-	INPUT_RECORD ir;
-	DWORD dwRead;
+	int val =d[left];
+	int lm = left-1;
+	int rm = right+1;
+	for(;;) {
+		do
+			rm--;
+		while (d[rm] > val);
 		
 		do 
-	{
-		ReadConsoleInput (hKeyboard, &ir, 1, &dwRead);
-		if ((ir.EventType == KEY_EVENT) &&
-			(ir.Event.KeyEvent.bKeyDown == TRUE))
-			return;
-	}
-	while (TRUE);
-}
+			lm++;
+		while( d[lm] < val);
 
-
-static VOID
-WaitForKey (VOID)
-{
-	DWORD dwWritten;
-
-	WriteFile (hStdErr,msg , len, &dwWritten, NULL);
-
-	ConInKey();
-
-	WriteFile (hStdErr, _T("\n"), 1, &dwWritten, NULL);
-
-//	FlushConsoleInputBuffer (hConsoleIn);
-}
-
-
-//INT CommandMore (LPTSTR cmd, LPTSTR param)
-int main (int argc, char **argv)
-{
-	SHORT maxx,maxy;
-	SHORT line_count=0,ch_count=0;
-	DWORD i, last;
-	HANDLE hFile = INVALID_HANDLE_VALUE;
-	TCHAR szFullPath[MAX_PATH];
-
-	/*reading/writing buffer*/
-	TCHAR *buff;
-
-	/*bytes written by WriteFile and ReadFile*/
-	DWORD dwRead,dwWritten;
-
-	/*ReadFile() return value*/
-	BOOL bRet;
-
-	len = _tcslen (msg);
-	hStdIn = GetStdHandle(STD_INPUT_HANDLE);
-	hStdOut = GetStdHandle(STD_OUTPUT_HANDLE);
-	hStdErr = GetStdHandle(STD_ERROR_HANDLE);
-
-	if (argc > 1 && _tcsncmp (argv[1], _T("/?"), 2) == 0)
-	{
-		ConOutPuts(_T("Help text still missing!!"));
-		return 0;
-	}
-
-	hKeyboard = CreateFile (_T("CONIN$"), GENERIC_READ,
-	                        0,NULL,OPEN_ALWAYS,0,0);
-
-	GetScreenSize(&maxx,&maxy);
-
-	buff=malloc(4096);
-
-	FlushConsoleInputBuffer (hKeyboard);	
-
-	if(argc > 1)
-	{
-		GetFullPathName(argv[1], MAX_PATH, szFullPath, NULL);
-		hFile = CreateFile (szFullPath, GENERIC_READ,
-	                        0,NULL,OPEN_ALWAYS,0,0);
-	}
-
-	do
-	{
-		if(hFile != INVALID_HANDLE_VALUE)
-		{			
-			bRet = ReadFile(hFile,buff,4096,&dwRead,NULL);
+		if(lm < rm) {
+			int tempr = d[rm];
+			d[rm] = d[lm];
+			d[lm] = tempr;
 			}
 		else 
-		{
-			bRet = ReadFile(hStdIn,buff,4096,&dwRead,NULL);
+			return rm;
+		}
 }
 
-		for(last=i=0;i<dwRead && bRet;i++)
+void Quicksort( int d[], int left, int right)
 {
-			ch_count++;
-			if(buff[i] == _T('\n') || ch_count == maxx)
-			{
-				ch_count=0;
-				line_count++;
-				if (line_count == maxy)
-				{
-					line_count = 0;
-					WriteFile(hStdOut,&buff[last], i-last+1, &dwWritten, NULL);
-					last=i+1;
-					FlushFileBuffers (hStdOut);
-					WaitForKey ();
+	if(left < (right-SELECTMODE)) {
+		int split_pt = Partition(d,left, right);
+		Quicksort(d, left, split_pt);
+		Quicksort(d, split_pt+1, right);
 		}
+	else SelectionSort(d, left, right);
 }
-		}
-		if (last<dwRead && bRet)
-			WriteFile(hStdOut,&buff[last], dwRead-last, &dwWritten, NULL);
 
-	}
-	while(dwRead>0 && bRet);
+int main(int argc, char* argv[]) {
 
-	free (buff);
-	CloseHandle (hKeyboard);
-	CloseHandle (hFile);
+	data = (int*)calloc(BIGDATA,4);
+	unsigned long int timeStart;
+
+	unsigned long int timeReadLoopStart;
+	unsigned long int timeReadLoopEnd;
+
+	unsigned long int timeSortLoopStart;
+	unsigned long int timeSortLoopEnd;
+
+	unsigned long int timeWriteLoopStart;
+	unsigned long int timeWriteLoopEnd;
+
+	unsigned long int timeEnd;
+
+	FILE *randfile;
+	FILE *sortfile;
+	int i,j,thisInt,dataSize = 0;
+	long sumUnsorted = 0;
+
+	rdtscll(timeStart);
+
+	randfile = fopen(argv[1],"r");
+	sortfile = fopen(argv[2],"w");
+	if (randfile == NULL || sortfile == NULL) {
+		fprintf(stderr,"Could not open all files.\n");
+		return 1;
+	}
+
+	rdtscll(timeReadLoopStart);
+
+	i = 0;
+	while (!feof(randfile)) {
+		fscanf(randfile,"%d",&thisInt);
+		if (feof(randfile)) { break; }
+		data[i] = thisInt;
+		sumUnsorted += thisInt;
+		//fprintf(stdout,"[%d] Read item: %d\n",i,thisInt);
+		i++;
+		if (i >= BIGDATA) { 
+			break;
+		}
+	}
+	fclose(randfile);
+	dataSize = i;
+
+	rdtscll(timeReadLoopEnd);
+	rdtscll(timeSortLoopStart);
+	
+	Quicksort(data, 0, dataSize-1);
+
+	rdtscll(timeSortLoopEnd);
+	rdtscll(timeWriteLoopStart);
+
+	int last = -1;
+	for(j = 0; j < dataSize; j++) {
+		if (data[j] < last) {
+			fprintf(stderr,"The data is not in order\n");
+			fprintf(stderr,"Noticed the problem at j = %d\n",j);
+			fclose(sortfile);
+			return 1;
+		} else {
+			fprintf(sortfile,"%d\n",data[j]);
+		}
+	}
+	fclose(sortfile);	
+
+	rdtscll(timeWriteLoopEnd);
+
+	rdtscll(timeEnd);
+
+	fprintf(stdout,"Sorted %d items.\n",dataSize);
+	fprintf(stdout,"Open Files   : %ldt.\n",(long)timeReadLoopStart - (long)timeStart);
+	fprintf(stdout,"Read Data    : %ldt.\n",(long)timeReadLoopEnd - (long)timeReadLoopStart);
+	fprintf(stdout,"Sort Data    : %ldt.\n",(long)timeSortLoopEnd - (long)timeSortLoopStart);
+	fprintf(stdout,"Write Data   : %ldt.\n",(long)timeWriteLoopEnd - (long)timeWriteLoopStart);
+	fprintf(stdout,"Total Time   : %ldt.\n",(long)timeEnd - (long)timeStart);
 
 	return 0;
 }
-
-/* EOF */

reactos/base/applications/cmdutils/more/more.rbuild

@@ -3,6 +3,7 @@
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>
+	<library>ntdll</library>
 	<file>more.c</file>
 	<file>more.rc</file>
 </module>

reactos/boot/freeldr/freeldr/freeldr.rbuild

@@ -6,7 +6,7 @@
     <library>freeldr_arch</library>
     <library>freeldr_main</library>
     <library>rossym</library>
-	<library>string</library>
     <library>cmlib</library>
     <library>rtl</library>
+    <library>libcntpr</library>
 </module>

reactos/boot/freeldr/freeldr/setupldr.rbuild

@@ -6,7 +6,7 @@
     <library>freeldr_arch</library>
     <library>setupldr_main</library>
     <library>rossym</library>
-	<library>string</library>
     <library>cmlib</library>
     <library>rtl</library>
+    <library>libcntpr</library>
 </module>

reactos/dll/ntdll/ntdll.rbuild

@@ -10,7 +10,7 @@
     <define name="_NTOSKRNL_" />
     <define name="__NO_CTYPE_INLINES" />
     <library>rtl</library>
-	<library>string</library>
+    <library>libcntpr</library>
     <library>pseh</library>
     <linkerflag>-lgcc</linkerflag>
     <linkerflag>-nostdlib</linkerflag>

reactos/dll/win32/crtdll/crtdll.rbuild

@@ -11,13 +11,15 @@
 	<define name="__REACTOS__" />
 	<define name="USE_MSVCRT_PREFIX" />
 	<define name="_MSVCRT_LIB_" />
+    <define name="__NO_CTYPE_INLINES" />
+    <define name="_CTYPE_DISABLE_MACROS" />
+    <define name="_NO_INLINING" />
 
 	<!--	__MINGW_IMPORT needs to be defined differently because it's defined
 		as dllimport by default, which is invalid from GCC 4.1.0 on!	-->
 	<define name="__MINGW_IMPORT">"extern __attribute__ ((dllexport))"</define>
 
 	<library>crt</library>
-	<library>string</library>
 	<library>kernel32</library>
 	<library>ntdll</library>
 	<pch>precomp.h</pch>

reactos/dll/win32/msvcrt/msvcrt.rbuild

@@ -14,15 +14,16 @@
 	<define name="USE_MSVCRT_PREFIX" />
 	<define name="_MSVCRT_LIB_" />
 	<define name="_MT" />
+    <define name="__NO_CTYPE_INLINES" />
+    <define name="_CTYPE_DISABLE_MACROS" />
+    <define name="_NO_INLINING" />
 
     <!--	__MINGW_IMPORT needs to be defined differently because it's defined
 		as dllimport by default, which is invalid from GCC 4.1.0 on!	-->
 	<define name="__MINGW_IMPORT">"extern __attribute__ ((dllexport))"</define>
 
 	<library>crt</library>
-	<library>string</library>
 	<library>kernel32</library>
-	<library>ntdll</library>
 	<library>wine</library>
 	<pch>precomp.h</pch>
 	<file>dllmain.c</file>

reactos/dll/win32/msvcrt20/msvcrt20.rbuild

@@ -9,7 +9,6 @@
 	<define name="USE_MSVCRT_PREFIX" />
 	<define name="_MT" />
 	<library>wine</library>
-	<library>string</library>
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>msvcrt</library>

reactos/drivers/video/displays/framebuf/framebuf.rbuild

@@ -3,7 +3,7 @@
 	<include base="framebuf">.</include>
 	<define name="__USE_W32API" />
 	<library>win32k</library>
-	<library>string</library>
+	<library>libcntpr</library>
 	<file>enable.c</file>
 	<file>palette.c</file>
 	<file>pointer.c</file>

reactos/lib/3rdparty/3rdparty.rbuild

@@ -10,9 +10,15 @@
     <directory name="expat">
         <xi:include href="expat/expat.rbuild" />
     </directory>
+    <directory name="libwine">
+        <xi:include href="libwine/libwine.rbuild" />
+    </directory>
     <directory name="libxml2">
         <xi:include href="libxml2/libxml2.rbuild" />
     </directory>
+    <directory name="mingw">
+        <xi:include href="mingw/mingw.rbuild" />
+    </directory>
     <directory name="zlib">
         <xi:include href="zlib/zlib.rbuild" />
     </directory>

reactos/lib/cmlib/cmlib.rbuild

@@ -5,6 +5,7 @@
 	<define name="_NTSYSTEM_" />
 	<define name="NASSERT" />
 	<pch>cmlib.h</pch>
+    <library>rtl</library>
 	<file>cminit.c</file>
 	<file>hivebin.c</file>
 	<file>hivecell.c</file>

reactos/lib/intrlck/decrement.c

@@ -1,25 +0,0 @@
-/*
- * PROJECT:     ReactOS system libraries
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        lib/intrlck/decrement.c
- * PURPOSE:     Inter lock decrements
- * PROGRAMMERS: Copyright 1995 Martin von Loewis
- *              Copyright 1997 Onno Hovers
- */
-
-#include <windows.h>
-
-/************************************************************************
-*           InterlockedDecrement                                        *
-*                                                                       *
-* InterlockedDecrement adds -1 to a long variable and returns           *
-* the resulting decremented value.                                      *
-*                                                                       *
-************************************************************************/
-
-LONG NTAPI
-InterlockedDecrement(
-	LPLONG lpAddend)
-{
-	return InterlockedExchangeAdd( lpAddend, -1 ) - 1;
-}

reactos/lib/intrlck/exchange.c

@@ -1,34 +0,0 @@
-/*
- * PROJECT:     ReactOS system libraries
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        lib/intrlck/exchange.c
- * PURPOSE:     Inter lock exchanges
- * PROGRAMMERS: Copyright 1995 Martin von Loewis
- *              Copyright 1997 Onno Hovers
- */
-
-#include <windows.h>
-
-/************************************************************************
- *           InterlockedExchange
- *
- * Atomically exchanges a pair of values.
- *
- * RETURNS
- *	Prior value of value pointed to by Target
- */
-
-LONG NTAPI
-InterlockedExchange(
-	LPLONG target,
-	LONG value)
-{
-	LONG ret;
-
-	do
-	{
-		ret = *(volatile LONG *)target;
-	} while( InterlockedCompareExchange( target, value, ret ) != ret );
-
-	return ret;
-}

reactos/lib/intrlck/exchangeadd.c

@@ -1,37 +0,0 @@
-/*
- * PROJECT:     ReactOS system libraries
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        lib/intrlck/exchangeadd.c
- * PURPOSE:     Inter lock exchange adds
- * PROGRAMMERS: Copyright 1995 Martin von Loewis
- *              Copyright 1997 Onno Hovers
- */
-
-#include <windows.h>
-
-/************************************************************************
- *           InterlockedExchangeAdd
- *
- * Atomically adds Increment to Addend and returns the previous value of
- * Addend
- *
- * RETURNS
- *	Prior value of value pointed to by Addend
- */
-
-LONG NTAPI
-InterlockedExchangeAdd(
-	PLONG Addend,
-	LONG Increment)
-{
-	LONG ret;
-	LONG newval;
-
-	do
-	{
-		ret = *(volatile LONG *)Addend;
-		newval = ret + Increment;
-	} while (InterlockedCompareExchange(Addend, ret, newval) != ret);
-
-	return ret;
-}

reactos/lib/intrlck/i386/compareexchange.c

@@ -1,37 +0,0 @@
-/*
- * PROJECT:     ReactOS system libraries
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        lib/intrlck/i386/compareexchange.c
- * PURPOSE:     Inter lock compare exchanges
- * PROGRAMMERS: Copyright 1995 Martin von Loewis
- *              Copyright 1997 Onno Hovers
- */
-
-/************************************************************************
- *           InterlockedCompareExchange
- *
- * Atomically compares Destination and Comperand, and if found equal exchanges
- * the value of Destination with Exchange
- *
- * RETURNS
- *	Prior value of value pointed to by Destination
- */
-
-/*
- * LONG NTAPI InterlockedCompareExchange(LPLONG Destination, LONG Exchange, LONG Comperand)
- */
-
-#include <windows.h>
-LONG
-NTAPI
-InterlockedCompareExchange(
-	IN OUT LONG volatile *Destination,
-	LONG Exchange,
-	LONG Comperand)
-{
-	LONG ret;
-	__asm__ __volatile__(
-		"lock; cmpxchgl %2,(%1)"
-		: "=a" (ret) : "r" (Destination), "r" (Exchange), "0" (Comperand) : "memory" );
-	return ret;
-}

reactos/lib/intrlck/i386/decrement.c

@@ -1,38 +0,0 @@
-/*
- * PROJECT:     ReactOS system libraries
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        lib/intrlck/i386/decrement.c
- * PURPOSE:     Inter lock decrements
- * PROGRAMMERS: Copyright 1995 Martin von Loewis
- *              Copyright 1997 Onno Hovers
- */
-
-/************************************************************************
-*           InterlockedDecrement                                        *
-*                                                                       *
-* InterlockedDecrement adds -1 to a long variable and returns           *
-* the resulting decremented value.                                      *
-*                                                                       *
-************************************************************************/
-
-/*
- * LONG NTAPI InterlockedDecrement(LPLONG lpAddend)
- */
-
-#include <windows.h>
-LONG
-NTAPI
-InterlockedDecrement(IN OUT LONG volatile *lpAddend)
-{
-	LONG ret;
-	__asm__
-	(
-		"\tlock\n"  /* for SMP systems */
-		"\txaddl %0, (%1)\n"
-		"\tdecl %0\n"
-		:"=r" (ret)
-		:"r" (lpAddend), "0" (-1)
-		: "memory"
-	);
-	return ret;
-}