diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-05-25 16:48:38 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-05-25 16:48:38 +0000 |
| commit | 4163b6f26b8a8a3c3e614c0a67a4a54ada89018e (patch) | |
| tree | 42b6a482c929ab8a8095add35f59a28cd3303c93 | |
| parent | 4406f3b806f6f904c7abcf7ab249b13e981bf856 (diff) | |
| download | ATCD-4163b6f26b8a8a3c3e614c0a67a4a54ada89018e.tar.gz | |
*** empty log message ***
| -rw-r--r-- | ChangeLog-97a | 17 | ||||
| -rw-r--r-- | ace/ACE.cpp | 9 | ||||
| -rw-r--r-- | ace/OS.h | 6 | ||||
| -rw-r--r-- | ace/Sched_Params.cpp | 4 | ||||
| -rw-r--r-- | include/makeinclude/platform_sunos5_sunc++_orbix.GNU | 2 |
5 files changed, 31 insertions, 7 deletions
diff --git a/ChangeLog-97a b/ChangeLog-97a index 3ca5c6cdfb0..864c60d7f1d 100644 --- a/ChangeLog-97a +++ b/ChangeLog-97a @@ -1,3 +1,18 @@ +Sun May 25 11:36:22 1997 Douglas C. Schmidt <schmidt@flamenco.cs.wustl.edu> + + * ace/Sched_Params.cpp (priority_max): Added another #ifdef for + Chorus. Thanks to Wei Chiang for reporting this. + + * include/makeinclude/platform_sunos5_sunc++_orbix.GNU: added -l + in front of orbixmt. Thanks to Wei Chiang for pointing this + out. + + * ace/ACE.cpp: Changed the default port for NT so that it starts + at 65279 rather than 65535. Hopefully, this will fix that + annoying bug that has been plaguing us on NT 4.0 for months. + Thanks to Goran Lowkrantz <Goran.Lowkrantz@Infologigruppen.se> + for reporting this. + Sat May 24 23:42:32 1997 David L. Levine <levine@cs.wustl.edu> * performance-tests/Misc/test_naming.cpp (do_testing): replaced @@ -5,6 +20,8 @@ Sat May 24 23:42:32 1997 David L. Levine <levine@cs.wustl.edu> Sat May 24 12:07:48 1997 Douglas C. Schmidt <schmidt@flamenco.cs.wustl.edu> + * Released version 4.2.1 for testing. + * ace/Reactor.cpp (bind): Fixed a stupid typo where I was using the ACE_REACTOR_EVENT_HANDLER macro instead of the ACE_REACTOR_HANDLE macro. Thanks to Detlef for reporting this. diff --git a/ace/ACE.cpp b/ace/ACE.cpp index 2b49dffc42b..4a26b74517c 100644 --- a/ace/ACE.cpp +++ b/ace/ACE.cpp @@ -823,8 +823,7 @@ ACE::bind_port (ACE_HANDLE handle) sockaddr_in sin; // This should be a constant, so I hope they never change the number // of bits in a port number! - const u_short MAX_SHORT = 65535; - static u_short upper_limit = MAX_SHORT; + static u_short upper_limit = ACE_MAX_DEFAULT_PORT; int lower_limit = IPPORT_RESERVED; int round_trip = upper_limit; @@ -847,11 +846,11 @@ ACE::bind_port (ACE_HANDLE handle) { upper_limit--; - /* Wrap back around when we reach the bottom. */ + // Wrap back around when we reach the bottom. if (upper_limit <= lower_limit) - upper_limit = MAX_SHORT; + upper_limit = ACE_MAX_DEFAULT_PORT; - /* See if we have already gone around once! */ + // See if we have already gone around once! if (upper_limit == round_trip) { errno = EAGAIN; @@ -1521,6 +1521,9 @@ struct utsname #define ACE_DEFAULT_GLOBALNAME_A "\\globalnames" #define ACE_DEFAULT_GLOBALNAME_W L"\\globalnames" +// Need to work around odd glitches with NT. +#define ACE_MAX_DEFAULT_PORT 65279 + // We're on WinNT or Win95 #define ACE_PLATFORM_A "Win32" #define ACE_PLATFORM_EXE_SUFFIX_A ".exe" @@ -1739,6 +1742,9 @@ typedef char TCHAR; #define RUSAGE_SELF 1 #endif /* m88k */ +// Default port is MAX_SHORT. +#define ACE_MAX_DEFAULT_PORT 65535 + // Default semaphore key #define ACE_DEFAULT_SEM_KEY 1234 #define ACE_INVALID_SEM_KEY -1 diff --git a/ace/Sched_Params.cpp b/ace/Sched_Params.cpp index 6701f605313..a6e5553f71e 100644 --- a/ace/Sched_Params.cpp +++ b/ace/Sched_Params.cpp @@ -162,7 +162,9 @@ ACE_Sched_Params::priority_max (const Policy policy, return ACE_THR_PRI_FIFO_MAX; case ACE_SCHED_RR: return ACE_THR_PRI_RR_MAX; - case ACE_SCHED_OTHER: +#if !defined (CHORUS) // SCHED_OTHRE and SCHED_RR have same value + case ACE_SCHED_OTHER: +#endif /* CHORUS */ default: return ACE_THR_PRI_OTHER_MAX; } diff --git a/include/makeinclude/platform_sunos5_sunc++_orbix.GNU b/include/makeinclude/platform_sunos5_sunc++_orbix.GNU index 915029d7039..6647d397485 100644 --- a/include/makeinclude/platform_sunos5_sunc++_orbix.GNU +++ b/include/makeinclude/platform_sunos5_sunc++_orbix.GNU @@ -10,7 +10,7 @@ LD = $(CXX) INCLDIRS = -I$(ORBIX_ROOT)/include PIC = -PIC LDFLAGS += $(PIC) -L$(ORBIX_ROOT)/lib -R $(WRAPPER_ROOT)/ace -R $(ORBIX_ROOT)/lib -LIBS += -orbixmt -lsocket -ldl -lnsl -lthread -lgen +LIBS += -lorbixmt -lsocket -ldl -lnsl -lthread -lgen AR = CC ARFLAGS = -xar -o RANLIB = echo |