Przeglądaj źródła

core: repaced the two pkg update event callbacks with one

- simplified usage as can be executed at the end of memory operations
  (malloc, free, realloc)
Daniel-Constantin Mierla 11 lat temu
rodzic
commit
bccf5cd079
2 zmienionych plików z 11 dodań i 25 usunięć
  1. 8 21
      events.c
  2. 3 4
      events.h

+ 8 - 21
events.c

@@ -117,14 +117,9 @@ int sr_event_register_cb(int type, sr_event_cb_f f)
 					_sr_events_list.run_action = f;
 				else return -1;
 			break;
-		case SREV_PKG_SET_USED:
-				if(_sr_events_list.pkg_set_used==0)
-					_sr_events_list.pkg_set_used = f;
-				else return -1;
-			break;
-		case SREV_PKG_SET_REAL_USED:
-				if(_sr_events_list.pkg_set_real_used==0)
-					_sr_events_list.pkg_set_real_used = f;
+		case SREV_PKG_UPDATE_STATS:
+				if(_sr_events_list.pkg_update_stats==0)
+					_sr_events_list.pkg_update_stats = f;
 				else return -1;
 			break;
 		case SREV_NET_DGRAM_IN:
@@ -218,16 +213,10 @@ int sr_event_exec(int type, void *data)
 					ret = _sr_events_list.run_action(data);
 					return ret;
 				} else return 1;
-		case SREV_PKG_SET_USED:
-				if(unlikely(_sr_events_list.pkg_set_used!=0))
-				{
-					ret = _sr_events_list.pkg_set_used(data);
-					return ret;
-				} else return 1;
-		case SREV_PKG_SET_REAL_USED:
-				if(unlikely(_sr_events_list.pkg_set_real_used!=0))
+		case SREV_PKG_UPDATE_STATS:
+				if(unlikely(_sr_events_list.pkg_update_stats!=0))
 				{
-					ret = _sr_events_list.pkg_set_real_used(data);
+					ret = _sr_events_list.pkg_update_stats(data);
 					return ret;
 				} else return 1;
 		case SREV_NET_DGRAM_IN:
@@ -285,10 +274,8 @@ int sr_event_enabled(int type)
 				return (_sr_events_list.core_stats!=0)?1:0;
 		case SREV_CFG_RUN_ACTION:
 				return (_sr_events_list.run_action!=0)?1:0;
-		case SREV_PKG_SET_USED:
-				return (_sr_events_list.pkg_set_used!=0)?1:0;
-		case SREV_PKG_SET_REAL_USED:
-				return (_sr_events_list.pkg_set_real_used!=0)?1:0;
+		case SREV_PKG_UPDATE_STATS:
+				return (_sr_events_list.pkg_update_stats!=0)?1:0;
 		case SREV_NET_DGRAM_IN:
 				return (_sr_events_list.net_dgram_in!=0)?1:0;
 		case SREV_TCP_HTTP_100C:

+ 3 - 4
events.h

@@ -27,8 +27,8 @@
 #define SREV_NET_DATA_OUT		2
 #define SREV_CORE_STATS			3
 #define SREV_CFG_RUN_ACTION		4
-#define SREV_PKG_SET_USED		5
-#define SREV_PKG_SET_REAL_USED		6
+#define SREV_PKG_UPDATE_STATS	5
+/*		6 - not used anymore */
 #define SREV_NET_DGRAM_IN		7
 #define SREV_TCP_HTTP_100C		8
 #define SREV_TCP_MSRP_FRAME		9
@@ -44,8 +44,7 @@ typedef struct sr_event_cb {
 	sr_event_cb_f net_data_out;
 	sr_event_cb_f core_stats;
 	sr_event_cb_f run_action;
-	sr_event_cb_f pkg_set_used;
-	sr_event_cb_f pkg_set_real_used;
+	sr_event_cb_f pkg_update_stats;
 	sr_event_cb_f net_dgram_in;
 	sr_event_cb_f tcp_http_100c;
 	sr_event_cb_f tcp_msrp_frame;