← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.h

  • Committer: Brian Aker
  • Date: 2011-01-17 06:29:39 UTC
  • mto: (2097.1.1 drizzle-build)
  • mto: This revision was merged to the branch mainline in revision 2098.
  • Revision ID: brian@tangent.org-20110117062939-d4ldbka3oycdzv78
Stype cleanup, also have session now return epoch_t

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.h
1270
1270
  const char* enter_cond(boost::condition_variable_any &cond, boost::mutex &mutex, const char* msg);
1271
1271
  void exit_cond(const char* old_msg);
1272
1272
 
1273
 
  time_t query_start()
 
1273
  type::Time::epoch_t query_start()
1274
1274
  {
1275
1275
    return getCurrentTimestampEpoch();
1276
1276
  }
1306
1306
  /**
1307
1307
   * Returns the current micro-timestamp
1308
1308
   */
1309
 
  uint64_t getCurrentTimestamp(bool actual= true) const
 
1309
  type::Time::epoch_t getCurrentTimestamp(bool actual= true) const
1310
1310
  { 
1311
 
    uint64_t t_mark;
 
1311
    type::Time::epoch_t t_mark;
1312
1312
 
1313
1313
    if (actual)
1314
1314
    {
1324
1324
  }
1325
1325
 
1326
1326
  // We may need to set user on this
1327
 
  time_t getCurrentTimestampEpoch() const
 
1327
  type::Time::epoch_t getCurrentTimestampEpoch() const
1328
1328
  { 
1329
1329
    if (not _user_time.is_not_a_date_time())
1330
1330
      return (_user_time - _epoch).total_seconds();
1332
1332
    return (_start_timer - _epoch).total_seconds();
1333
1333
  }
1334
1334
 
1335
 
  time_t getCurrentTimestampEpoch(type::Time::usec_t &fraction_arg) const
 
1335
  type::Time::epoch_t getCurrentTimestampEpoch(type::Time::usec_t &fraction_arg) const
1336
1336
  { 
1337
1337
    if (not _user_time.is_not_a_date_time())
1338
1338
    {