Skip to content

Updated support for Green Hills INTEGRITY and INTEGRITY-178 RTOS #2340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 33 commits into from
Apr 22, 2025
Merged

Updated support for Green Hills INTEGRITY and INTEGRITY-178 RTOS #2340

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
ac3ed1a
Updated support for Green Hills INTEGRITY
mitza-oci Dec 9, 2024
9b24977
Merge master
sonndinh Feb 21, 2025
b0e625b
Manually merge files
sonndinh Feb 24, 2025
44ad5da
More merge from master
sonndinh Feb 24, 2025
84f4171
Fix build
sonndinh Feb 24, 2025
3bc8288
Make exception handling configurable
sonndinh Feb 25, 2025
eca01a8
Built libACE on INTEGRITY-178
sonndinh Feb 25, 2025
4688527
- Fix build on INTEGRITY-178
sonndinh Feb 28, 2025
b41152e
Fix build
sonndinh Mar 3, 2025
ee44e16
Merge branch 'master' of github.com:DOCGroup/ACE_TAO into ACE-master-ghs
sonndinh Mar 3, 2025
b4bb241
Address review and fix build
sonndinh Mar 3, 2025
09178e3
Fix build for ace_for_tao.mpc and address review
sonndinh Mar 4, 2025
affb02a
From review
sonndinh Mar 6, 2025
fb5e75a
From review
sonndinh Mar 11, 2025
17a67dc
Use negate macro for turning off exception handling
sonndinh Mar 11, 2025
eacd11f
From review
sonndinh Mar 18, 2025
0d89269
Revert change to ACE_Service_Config::open_i
mitza-oci Mar 19, 2025
e409265
Merge remote-tracking branch 'upstream/master' into ACE-master-ghs
mitza-oci Mar 19, 2025
191b7f9
Merge remote-tracking branch 'upstream/master' into ACE-master-ghs
mitza-oci Mar 19, 2025
bbf4f80
Fix merge collision with #2362
mitza-oci Mar 19, 2025
9914124
From review
sonndinh Mar 19, 2025
18834d7
Merge remote-tracking branch 'upstream/master' into ACE-master-ghs
mitza-oci Mar 20, 2025
718484e
Updated for style/consistency
mitza-oci Mar 20, 2025
aaabd62
- Address review
sonndinh Mar 20, 2025
882ff47
Fix lint
sonndinh Mar 20, 2025
d3b1729
Updates to Single_Input_Reactor and TAO resources
mitza-oci Mar 21, 2025
7532e69
Address reviews
sonndinh Mar 21, 2025
c347c09
From review
sonndinh Mar 24, 2025
845fe59
From review
sonndinh Mar 26, 2025
cfd482b
More review
sonndinh Mar 28, 2025
1032fd9
Per review
sonndinh Mar 28, 2025
f6cf9e7
Remove _REENTRANT from INTEGRITY config files and let user set it
sonndinh Apr 8, 2025
fa705dd
- Remove inet_ntoa emulation since it's not thread-safe and not used …
sonndinh Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions ACE/ace/OS_NS_arpa_inet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,24 +102,4 @@ ACE_OS::inet_aton (const char *host_name, struct in_addr *addr)
#endif /* ACE_LACKS_INET_ATON */
}

#if defined (ACE_INTEGRITY) && defined (ACE_LACKS_INET_NTOA)
char* ACE_OS::inet_ntoa (const struct in_addr addr)
{
ACE_OS_TRACE ("ACE_OS::inet_ntoa");

static ACE_thread_mutex_t mutex;
static char addrstr[INET_ADDRSTRLEN + 1] = { 0 };

LockGuard guard (mutex);
ACE_UINT32 ipaddr = ntohl (addr.s_addr);
sprintf (addrstr,
"%d.%d.%d.%d",
((ipaddr & 0xff000000) >> 24) & 0x000000ff,
(ipaddr & 0x00ff0000) >> 16,
(ipaddr & 0x0000ff00) >> 8,
(ipaddr & 0x000000ff));
return addrstr;
}
#endif /* ACE_INTEGRITY && ACE_LACKS_INET_NTOA */

ACE_END_VERSIONED_NAMESPACE_DECL
2 changes: 0 additions & 2 deletions ACE/ace/OS_NS_arpa_inet.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ ACE_OS::inet_addr (const char *name)
#endif /* ACE_HAS_NONCONST_INET_ADDR */
}

#if !(defined (ACE_INTEGRITY) && defined (ACE_LACKS_INET_NTOA))
ACE_INLINE char *
ACE_OS::inet_ntoa (const struct in_addr addr)
{
Expand All @@ -65,7 +64,6 @@ ACE_OS::inet_ntoa (const struct in_addr addr)
return ::inet_ntoa (addr);
# endif
}
#endif

ACE_INLINE const char *
ACE_OS::inet_ntop (int family, const void *addrptr, char *strptr, size_t len)
Expand Down
9 changes: 7 additions & 2 deletions ACE/ace/OS_NS_sys_utsname.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,13 +214,17 @@ ACE_OS::uname (ACE_utsname *name)

return ACE_OS::hostname (name->nodename, maxnamelen);
#elif defined (ACE_INTEGRITY)
# if defined (ACE_LACKS_GETHOSTNAME)
ACE_UNUSED_ARG (name);
ACE_NOTSUP_RETURN (-1);
# else
if (!name)
{
errno = EFAULT;
return -1;
}

if (ACE_OS::hostname (name->nodename, __SYS_NMLN) != 0)
if (::gethostname (name->nodename, __SYS_NMLN) != 0)
return -1;

# if defined (ACE_INTEGRITY178B)
Expand All @@ -233,8 +237,9 @@ ACE_OS::uname (ACE_utsname *name)
ACE_OS::strcpy (name->release, "minor");
ACE_OS::strcpy (name->version, "11.4.6");
ACE_OS::strcpy (name->machine, "a standard name");
# endif /* ACE_INTEGRITY178B */
# endif
return 0;
# endif /* ACE_LACKS_GETHOSTNAME */
#else
ACE_UNUSED_ARG (name);
ACE_NOTSUP_RETURN (-1);
Expand Down