add ut_define

zhenwusw · Sep 13, 2017 · d00c09a · d00c09a
1 parent 8b9e603
commit d00c09a
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 29 deletions.
diff --git a/marketprice/mp_config.h b/marketprice/mp_config.h
@@ -30,6 +30,7 @@
 # include "ut_kafka.h"
 # include "ut_signal.h"
 # include "ut_config.h"
+# include "ut_define.h"
 # include "ut_decimal.h"
 # include "ut_rpc_clt.h"
 # include "ut_rpc_svr.h"

diff --git a/marketprice/mp_message.c b/marketprice/mp_message.c
@@ -453,7 +453,7 @@ static int market_update(const char *market, double timestamp, mpd_t *price, mpd
     json_object_set_new(deal, "time", json_real(timestamp));
     json_object_set_new_mpd(deal, "price", price);
     json_object_set_new_mpd(deal, "amount", amount);
-    if (side == MARKET_SIDE_SELL) {
+    if (side == MARKET_ORDER_SIDE_ASK) {
         json_object_set_new(deal, "type", json_string("sell"));
     } else {
         json_object_set_new(deal, "type", json_string("buy"));
@@ -503,7 +503,7 @@ static void on_deals_message(sds message, int64_t offset)
         goto cleanup;
     }
     int side = json_integer_value(json_array_get(obj, 10));
-    if (side != MARKET_SIDE_SELL && side != MARKET_SIDE_BUY) {
+    if (side != MARKET_ORDER_SIDE_ASK && side != MARKET_ORDER_SIDE_BID) {
         goto cleanup;
     }
     uint64_t id = json_integer_value(json_array_get(obj, 11));

diff --git a/marketprice/mp_message.h b/marketprice/mp_message.h
@@ -6,13 +6,11 @@
 # ifndef _MP_MESSAGE_H_
 # define _MP_MESSAGE_H_
 
-# define MARKET_SIDE_SELL   1
-# define MARKET_SIDE_BUY    2
+# include "mp_config.h"
+
 # define MARKET_DEALS_MAX   10000
 # define MARKET_NAME_MAX    12
 
-# include "mp_config.h"
-
 int init_message(void);
 bool market_exist(const char *market);
 

diff --git a/matchengine/config.json b/matchengine/config.json
@@ -76,41 +76,43 @@
             "money": {
                 "name": "CNY",
                 "prec": 2
-            }
+            },
+            "min_amount": "0.001"
         }, {
-            "name": "ETHCNY",
+            "name": "BCCCNY",
             "stock": {
-                "name": "ETH",
+                "name": "BCC",
                 "prec": 4
             },
             "money": {
                 "name": "CNY",
                 "prec": 2
-            }
+            },
+            "min_amount": "0.001"
         }, {
-            "name": "ZECCNY",
+            "name": "ETHCNY",
             "stock": {
-                "name": "ZEC",
+                "name": "ETH",
                 "prec": 4
             },
             "money": {
                 "name": "CNY",
                 "prec": 2
             }
         }, {
-            "name": "LTCCNY",
+            "name": "ZECCNY",
             "stock": {
-                "name": "LTC",
+                "name": "ZEC",
                 "prec": 4
             },
             "money": {
                 "name": "CNY",
                 "prec": 2
             }
         }, {
-            "name": "BCCCNY",
+            "name": "LTCCNY",
             "stock": {
-                "name": "BCC",
+                "name": "LTC",
                 "prec": 4
             },
             "money": {
@@ -136,7 +138,8 @@
             "money": {
                 "name": "BTC",
                 "prec": 8
-            }
+            },
+            "min_amount": "0.001"
         }, {
             "name": "LTCBTC",
             "stock": {
@@ -176,7 +179,8 @@
             "money": {
                 "name": "BCC",
                 "prec": 8
-            }
+            },
+            "min_amount": "0.001"
         }, {
             "name": "LTCBCC",
             "stock": {

diff --git a/matchengine/me_config.h b/matchengine/me_config.h
@@ -29,6 +29,7 @@
 # include "ut_list.h"
 # include "ut_mysql.h"
 # include "ut_signal.h"
+# include "ut_define.h"
 # include "ut_config.h"
 # include "ut_decimal.h"
 # include "ut_rpc_clt.h"

diff --git a/matchengine/me_history.h b/matchengine/me_history.h
@@ -8,8 +8,6 @@
 
 # include "me_market.h"
 
-# define HISTORY_HASH_NUM   100
-
 int init_history(void);
 int fini_history(void);
 

diff --git a/matchengine/me_market.h b/matchengine/me_market.h
@@ -11,15 +11,6 @@
 extern uint64_t order_id_start;
 extern uint64_t deals_id_start;
 
-# define MARKET_ORDER_TYPE_LIMIT    1
-# define MARKET_ORDER_TYPE_MARKET   2
-
-# define MARKET_ORDER_SIDE_ASK      1
-# define MARKET_ORDER_SIDE_BID      2
-
-# define MARKET_ROLE_MAKER          1
-# define MARKET_ROLE_TAKER          2
-
 typedef struct order_t {
     uint64_t        id;
     uint32_t        type;

diff --git a/utils/ut_define.h b/utils/ut_define.h
@@ -0,0 +1,22 @@
+/*
+ * Description: 
+ *     History: yang@haipo.me, 2017/09/13, create
+ */
+
+
+# ifndef _UT_DEFINE_H_
+# define _UT_DEFINE_H_
+
+# define MARKET_ORDER_TYPE_LIMIT    1
+# define MARKET_ORDER_TYPE_MARKET   2
+
+# define MARKET_ORDER_SIDE_ASK      1
+# define MARKET_ORDER_SIDE_BID      2
+
+# define MARKET_ROLE_MAKER          1
+# define MARKET_ROLE_TAKER          2
+
+# define HISTORY_HASH_NUM           100
+
+# endif
+