Repository: trafficserver Updated Branches: refs/heads/master 06a87ca9c -> 63ce14d10
Remove unused MGMT_API code. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/63ce14d1 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/63ce14d1 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/63ce14d1 Branch: refs/heads/master Commit: 63ce14d10511c743e4948e040256f5ccf4b4521f Parents: 06a87ca Author: James Peach <[email protected]> Authored: Mon Jul 28 11:36:40 2014 -0700 Committer: James Peach <[email protected]> Committed: Mon Jul 28 11:36:40 2014 -0700 ---------------------------------------------------------------------- mgmt/Alarms.cc | 35 ----------------------------------- mgmt/Main.cc | 12 ------------ 2 files changed, 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/63ce14d1/mgmt/Alarms.cc ---------------------------------------------------------------------- diff --git a/mgmt/Alarms.cc b/mgmt/Alarms.cc index 099adbf..32df682 100644 --- a/mgmt/Alarms.cc +++ b/mgmt/Alarms.cc @@ -28,11 +28,6 @@ #include "Alarms.h" #include "Diags.h" -#if defined(MGMT_API) -#include "TSControlMain.h" -#include "Message.h" -#include "Defs.h" -#endif #include "P_RecCore.h" @@ -313,36 +308,6 @@ Alarms::signalAlarm(alarm_t a, const char *desc, const char *ip) ink_strlcpy(atmp->description, desc, atmp_desc_size); ink_mutex_release(&mutex); -#if defined(MGMT_API) - if (mgmt_alarm_event_q) { - // ADDED CODE here is where we Add to the queue of alarms one more - EventNoticeForm *new_alarm = (EventNoticeForm *)ats_malloc(sizeof(EventNoticeForm)); - - // allocated space copy over values - // remember AlarmID start from 0 exactly 1 off but everything else - // matches - new_alarm->alarm_t = (AlarmID) (atmp->type - 1); - new_alarm->priority = atmp->priority; - new_alarm->linger = atmp->linger; - new_alarm->local = atmp->local; - new_alarm->seen = atmp->seen; - if (!atmp->local) - new_alarm->inet_address = atmp->inet_address; - if (!atmp->description) { - new_alarm->description = NULL; - } else { - new_alarm->description = ats_strdup(atmp->description); - } - - // new alarm is complete now add it - ink_mutex_acquire(&mgmt_alarm_event_q->mgmt_alarm_lock); - - // enqueue - enqueue(mgmt_alarm_event_q->mgmt_alarm_q, new_alarm); - - ink_mutex_release(&mgmt_alarm_event_q->mgmt_alarm_lock); - } -#endif for (entry = ink_hash_table_iterator_first(cblist, &iterator_state); entry != NULL; entry = ink_hash_table_iterator_next(cblist, &iterator_state)) { http://git-wip-us.apache.org/repos/asf/trafficserver/blob/63ce14d1/mgmt/Main.cc ---------------------------------------------------------------------- diff --git a/mgmt/Main.cc b/mgmt/Main.cc index ea1f12d..12bfe39 100644 --- a/mgmt/Main.cc +++ b/mgmt/Main.cc @@ -44,9 +44,6 @@ // Needs LibRecordsConfigInit() #include "RecordsConfig.h" -#if defined(MGMT_API) -#include "TSControlMain.h" -#endif #include "StatProcessor.h" @@ -560,15 +557,6 @@ main(int argc, char **argv) mime_init(); http_init(); -#if defined(MGMT_API) - // initialize alarm queue - int ret; - - ret = init_mgmt_alarm_q(mgmt_alarm_event_q); - if (ret < 0) - mgmt_alarm_event_q = NULL; - -#endif #if TS_HAS_WCCP Init_Errata_Logging();
