diff options
Diffstat (limited to 'TAO')
13 files changed, 32 insertions, 18 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 4f97c604d1c..8dece98fdc9 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,17 @@ +Sun Aug 17 16:53:42 1997 Carlos O'Ryan <coryan@swarm.cs.wustl.edu> + + * IIOP/test/Orbeline/client/Profile_Timer.h: + * IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp: + * IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.h: + * IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.cpp: + * IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.h: + * tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp: + * tests/Cubit/VisiBroker/base_server/Profile_Timer.h: + * tests/Cubit/VisiBroker/client/Profile_Timer.cpp: + * tests/Cubit/VisiBroker/client/Profile_Timer.h: + We no longer use timestruct_t in ACE, it is a SYSVism; we use + timespec_t instead. + Sat Aug 16 01:11:56 1997 Chris Cleeland <cleeland@cs.wustl.edu> * tests/Cubit/TAO/svc.conf: Added this as an example of an diff --git a/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.cpp b/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.cpp index 526a3dc4efc..a871b9cf179 100644 --- a/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.cpp +++ b/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.cpp @@ -57,7 +57,7 @@ Profile_Timer::elapsed_rusage (prusage_t &rusage) void Profile_Timer::compute_times (Elapsed_Time &et, prusage_t &end, prusage_t &begin) { - timestruc_t td; + timespec_t td; this->subtract (td, end.pr_tstamp, begin.pr_tstamp); et.real_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000); @@ -79,7 +79,7 @@ Profile_Timer::elapsed_time (Elapsed_Time &et) /* Determine the difference between T1 and T2. */ void -Profile_Timer::subtract (timestruc_t &tdiff, timestruc_t &t1, timestruc_t &t0) +Profile_Timer::subtract (timespec_t &tdiff, timespec_t &t1, timespec_t &t0) { tdiff.tv_sec = t1.tv_sec - t0.tv_sec; tdiff.tv_nsec = t1.tv_nsec - t0.tv_nsec; diff --git a/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.h b/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.h index b3aed157232..f001f59be9a 100644 --- a/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.h +++ b/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.h @@ -30,7 +30,7 @@ public: void get_rusage (prusage_t &rusage); private: - void subtract (timestruc_t &tdiff, timestruc_t &t0, timestruc_t &t1); + void subtract (timespec_t &tdiff, timespec_t &t0, timespec_t &t1); void compute_times (Elapsed_Time &et, prusage_t &, prusage_t &); prusage_t begin_usage_; diff --git a/TAO/IIOP/test/Orbeline/client/Profile_Timer.cpp b/TAO/IIOP/test/Orbeline/client/Profile_Timer.cpp index 526a3dc4efc..a871b9cf179 100644 --- a/TAO/IIOP/test/Orbeline/client/Profile_Timer.cpp +++ b/TAO/IIOP/test/Orbeline/client/Profile_Timer.cpp @@ -57,7 +57,7 @@ Profile_Timer::elapsed_rusage (prusage_t &rusage) void Profile_Timer::compute_times (Elapsed_Time &et, prusage_t &end, prusage_t &begin) { - timestruc_t td; + timespec_t td; this->subtract (td, end.pr_tstamp, begin.pr_tstamp); et.real_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000); @@ -79,7 +79,7 @@ Profile_Timer::elapsed_time (Elapsed_Time &et) /* Determine the difference between T1 and T2. */ void -Profile_Timer::subtract (timestruc_t &tdiff, timestruc_t &t1, timestruc_t &t0) +Profile_Timer::subtract (timespec_t &tdiff, timespec_t &t1, timespec_t &t0) { tdiff.tv_sec = t1.tv_sec - t0.tv_sec; tdiff.tv_nsec = t1.tv_nsec - t0.tv_nsec; diff --git a/TAO/IIOP/test/Orbeline/client/Profile_Timer.h b/TAO/IIOP/test/Orbeline/client/Profile_Timer.h index b3aed157232..f001f59be9a 100644 --- a/TAO/IIOP/test/Orbeline/client/Profile_Timer.h +++ b/TAO/IIOP/test/Orbeline/client/Profile_Timer.h @@ -30,7 +30,7 @@ public: void get_rusage (prusage_t &rusage); private: - void subtract (timestruc_t &tdiff, timestruc_t &t0, timestruc_t &t1); + void subtract (timespec_t &tdiff, timespec_t &t0, timespec_t &t1); void compute_times (Elapsed_Time &et, prusage_t &, prusage_t &); prusage_t begin_usage_; diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp index 526a3dc4efc..a871b9cf179 100644 --- a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp +++ b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp @@ -57,7 +57,7 @@ Profile_Timer::elapsed_rusage (prusage_t &rusage) void Profile_Timer::compute_times (Elapsed_Time &et, prusage_t &end, prusage_t &begin) { - timestruc_t td; + timespec_t td; this->subtract (td, end.pr_tstamp, begin.pr_tstamp); et.real_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000); @@ -79,7 +79,7 @@ Profile_Timer::elapsed_time (Elapsed_Time &et) /* Determine the difference between T1 and T2. */ void -Profile_Timer::subtract (timestruc_t &tdiff, timestruc_t &t1, timestruc_t &t0) +Profile_Timer::subtract (timespec_t &tdiff, timespec_t &t1, timespec_t &t0) { tdiff.tv_sec = t1.tv_sec - t0.tv_sec; tdiff.tv_nsec = t1.tv_nsec - t0.tv_nsec; diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.h b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.h index b3aed157232..f001f59be9a 100644 --- a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.h +++ b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.h @@ -30,7 +30,7 @@ public: void get_rusage (prusage_t &rusage); private: - void subtract (timestruc_t &tdiff, timestruc_t &t0, timestruc_t &t1); + void subtract (timespec_t &tdiff, timespec_t &t0, timespec_t &t1); void compute_times (Elapsed_Time &et, prusage_t &, prusage_t &); prusage_t begin_usage_; diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.cpp b/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.cpp index 526a3dc4efc..a871b9cf179 100644 --- a/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.cpp +++ b/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.cpp @@ -57,7 +57,7 @@ Profile_Timer::elapsed_rusage (prusage_t &rusage) void Profile_Timer::compute_times (Elapsed_Time &et, prusage_t &end, prusage_t &begin) { - timestruc_t td; + timespec_t td; this->subtract (td, end.pr_tstamp, begin.pr_tstamp); et.real_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000); @@ -79,7 +79,7 @@ Profile_Timer::elapsed_time (Elapsed_Time &et) /* Determine the difference between T1 and T2. */ void -Profile_Timer::subtract (timestruc_t &tdiff, timestruc_t &t1, timestruc_t &t0) +Profile_Timer::subtract (timespec_t &tdiff, timespec_t &t1, timespec_t &t0) { tdiff.tv_sec = t1.tv_sec - t0.tv_sec; tdiff.tv_nsec = t1.tv_nsec - t0.tv_nsec; diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.h b/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.h index b3aed157232..f001f59be9a 100644 --- a/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.h +++ b/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.h @@ -30,7 +30,7 @@ public: void get_rusage (prusage_t &rusage); private: - void subtract (timestruc_t &tdiff, timestruc_t &t0, timestruc_t &t1); + void subtract (timespec_t &tdiff, timespec_t &t0, timespec_t &t1); void compute_times (Elapsed_Time &et, prusage_t &, prusage_t &); prusage_t begin_usage_; diff --git a/TAO/tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp b/TAO/tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp index 526a3dc4efc..a871b9cf179 100644 --- a/TAO/tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp +++ b/TAO/tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp @@ -57,7 +57,7 @@ Profile_Timer::elapsed_rusage (prusage_t &rusage) void Profile_Timer::compute_times (Elapsed_Time &et, prusage_t &end, prusage_t &begin) { - timestruc_t td; + timespec_t td; this->subtract (td, end.pr_tstamp, begin.pr_tstamp); et.real_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000); @@ -79,7 +79,7 @@ Profile_Timer::elapsed_time (Elapsed_Time &et) /* Determine the difference between T1 and T2. */ void -Profile_Timer::subtract (timestruc_t &tdiff, timestruc_t &t1, timestruc_t &t0) +Profile_Timer::subtract (timespec_t &tdiff, timespec_t &t1, timespec_t &t0) { tdiff.tv_sec = t1.tv_sec - t0.tv_sec; tdiff.tv_nsec = t1.tv_nsec - t0.tv_nsec; diff --git a/TAO/tests/Cubit/VisiBroker/base_server/Profile_Timer.h b/TAO/tests/Cubit/VisiBroker/base_server/Profile_Timer.h index b3aed157232..f001f59be9a 100644 --- a/TAO/tests/Cubit/VisiBroker/base_server/Profile_Timer.h +++ b/TAO/tests/Cubit/VisiBroker/base_server/Profile_Timer.h @@ -30,7 +30,7 @@ public: void get_rusage (prusage_t &rusage); private: - void subtract (timestruc_t &tdiff, timestruc_t &t0, timestruc_t &t1); + void subtract (timespec_t &tdiff, timespec_t &t0, timespec_t &t1); void compute_times (Elapsed_Time &et, prusage_t &, prusage_t &); prusage_t begin_usage_; diff --git a/TAO/tests/Cubit/VisiBroker/client/Profile_Timer.cpp b/TAO/tests/Cubit/VisiBroker/client/Profile_Timer.cpp index 526a3dc4efc..a871b9cf179 100644 --- a/TAO/tests/Cubit/VisiBroker/client/Profile_Timer.cpp +++ b/TAO/tests/Cubit/VisiBroker/client/Profile_Timer.cpp @@ -57,7 +57,7 @@ Profile_Timer::elapsed_rusage (prusage_t &rusage) void Profile_Timer::compute_times (Elapsed_Time &et, prusage_t &end, prusage_t &begin) { - timestruc_t td; + timespec_t td; this->subtract (td, end.pr_tstamp, begin.pr_tstamp); et.real_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000); @@ -79,7 +79,7 @@ Profile_Timer::elapsed_time (Elapsed_Time &et) /* Determine the difference between T1 and T2. */ void -Profile_Timer::subtract (timestruc_t &tdiff, timestruc_t &t1, timestruc_t &t0) +Profile_Timer::subtract (timespec_t &tdiff, timespec_t &t1, timespec_t &t0) { tdiff.tv_sec = t1.tv_sec - t0.tv_sec; tdiff.tv_nsec = t1.tv_nsec - t0.tv_nsec; diff --git a/TAO/tests/Cubit/VisiBroker/client/Profile_Timer.h b/TAO/tests/Cubit/VisiBroker/client/Profile_Timer.h index b3aed157232..f001f59be9a 100644 --- a/TAO/tests/Cubit/VisiBroker/client/Profile_Timer.h +++ b/TAO/tests/Cubit/VisiBroker/client/Profile_Timer.h @@ -30,7 +30,7 @@ public: void get_rusage (prusage_t &rusage); private: - void subtract (timestruc_t &tdiff, timestruc_t &t0, timestruc_t &t1); + void subtract (timespec_t &tdiff, timespec_t &t0, timespec_t &t1); void compute_times (Elapsed_Time &et, prusage_t &, prusage_t &); prusage_t begin_usage_; |