diff --git a/.gitignore b/.gitignore
index af91c8315..5fe2ccc4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ src/server/sparkd/orderman/perf_analysis/data
src/server/sparkd/orderman/perf_analysis/logs/
src/server/sparkd/orderman/perf_analysis/trace_data/
src/lib/orderman/perf_analysis/logs/latency_data/
+trace_data/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e70a57cd..5eabed1dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ else ()
-fPIC -Wall -pedantic -Wextra -Werror \
-Wno-missing-braces -Wno-ignored-qualifiers \
--std=c++17 -fdiagnostics-color")
- set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} -DNDEBUG -O3")
+ set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -DNDEBUG -O3")
add_subdirectory(src/server/sparkd)
add_subdirectory(src/lib)
add_subdirectory(src/web)
diff --git a/doc/dev/dev_process.html b/doc/dev/dev_process.html
new file mode 100644
index 000000000..e4cb3bcd0
--- /dev/null
+++ b/doc/dev/dev_process.html
@@ -0,0 +1,301 @@
+
+
+
+
+
+
+
+We are going to experiment with our development process, getting away
+from cycles and towards more continuous development. The main idea is
+to get rid of the prod and QA branches and instead deploy directly
+from master, which we keep deployment ready at all times. Development
+occurs on private branches, each branch mapped to a separately
+deploy-able project. Each of projects will be managed more or less
+independently and will include specification, development and
+validation stages. At any particular time we might have anywhere from
+1 to 6 projects in flight each of which continuously pulls from master,
+but does not push back to master until the code is ready to be
+deployed to production. The point at which a project is ready to be
+deployed then takes roughly the place of the QA phase of our old cycle
+mode. At this time, we will do a PR, and go through a series of
+validation steps, to make sure the work meets our standards. This
+validation includes:
+
+
+
+- Code Reviews
+- Acceptance Testing (including UI and business tests)
+- Automated System testing (to be developed)
+- A mini-qa, focused on the feature, by someone not directly involved
+in its implementation
+- If possible, deployment to a beta customer.
+
+
+
+Once these QA gates are passed, we will update the release notes, tag
+a new version, integrate to master and then ideally immediately deploy
+to a customer.
+
+
+
+The main goal with this change is to reduce the latency from feature
+specification to production roll out. We also hope to improve
+throughput by making more efficient use of QA time and reducing idle
+cycles. We expect people to participate in more than one project
+depending on their area of expertise and work load. This does not mean
+people will work on two things at the same time, rather that people
+come into and leave projects as they free up and not when the project
+starts or ends.
+
+
+
+This new scheme will come into full effect when we finish 1.3
+although to some degree 1.3 was already setup like this. At the
+moment, we have 3 major projects, vap/settlments/implied, grid
+settings and speed work, which are in branches of prod. We will merge
+these back to prod and then master this week. We have 3 other projects
+that are in master, the excel API, the server side SDK and the MIC
+administration and enforcement components. These we hope to stabilize
+as soon as possible so that we can merge them to prod and deploy them
+along with the rest. Once we have all this, prod and master should be
+identical and we will delete prod and operate exclusively out of
+master. Please avoid committing anything new to master so we can
+complete this transition as soon as possible.
+
+
+
+Let me know if you have any question
+
+
+
+
Author: ppinto
+
Created: 2018-10-08 Mon 18:50
+
Validate
+
+
+
diff --git a/doc/dev/dev_process.org b/doc/dev/dev_process.org
new file mode 100644
index 000000000..b557fe746
--- /dev/null
+++ b/doc/dev/dev_process.org
@@ -0,0 +1,55 @@
+We are going to experiment with our development process, getting away
+from cycles and towards more continuous development. The main idea is
+to get rid of the prod and QA branches and instead deploy directly
+from master, which we keep deployment ready at all times. Development
+occurs on private branches, each branch mapped to a separately
+deploy-able project. Each of projects will be managed more or less
+independently and will include specification, development and
+validation stages. At any particular time we might have anywhere from
+1 to 6 projects in flight each of which continuously pulls from master,
+but does not push back to master until the code is ready to be
+deployed to production. The point at which a project is ready to be
+deployed then takes roughly the place of the QA phase of our old cycle
+mode. At this time, we will do a PR, and go through a series of
+validation steps, to make sure the work meets our standards. This
+validation includes:
+
+- Code Reviews
+- Acceptance Testing (including UI and business tests)
+- Automated System testing (to be developed)
+- A mini-qa, focused on the feature, by someone not directly involved
+ in its implementation
+- If possible, deployment to a beta customer.
+
+Once these QA gates are passed, we will update the release notes, tag
+a new version, integrate to master and then ideally immediately deploy
+to a customer.
+
+The main goal with this change is to reduce the latency from feature
+specification to production roll out. We also hope to improve
+throughput by making more efficient use of QA time and reducing idle
+cycles. We expect people to participate in more than one project
+depending on their area of expertise and work load. This does not mean
+people will work on two things at the same time, rather that people
+come into and leave projects as they free up and not when the project
+starts or ends.
+
+This new scheme will come into full effect when we finish 1.3
+although to some degree 1.3 was already setup like this. At the
+moment, we have 3 major projects, vap/settlments/implied, grid
+settings and speed work, which are in branches of prod. We will merge
+these back to prod and then master this week. We have 3 other projects
+that are in master, the excel API, the server side SDK and the MIC
+administration and enforcement components. These we hope to stabilize
+as soon as possible so that we can merge them to prod and deploy them
+along with the rest. Once we have all this, prod and master should be
+identical and we will delete prod and operate exclusively out of
+master. Please avoid committing anything new to master so we can
+complete this transition as soon as possible.
+
+Let me know if you have any question
+
+
+
+
+
diff --git a/ops_notes.txt b/ops_notes.txt
index dfe2ac2a2..0ffdf4188 100644
--- a/ops_notes.txt
+++ b/ops_notes.txt
@@ -1,3 +1,6 @@
+1.3.4
+- Changed default logging config for Windows. If Logging config is overridden for a system it should be adjusted to override only linux.
+
1.1.0
- With this release we dropped wild cards from limits, so any user
that has limits expressed in terms of wild cards will have to have
diff --git a/src/client/spark/Daemons/SecurityPickerDaemon.cs b/src/client/spark/Daemons/SecurityPickerDaemon.cs
index 5b066f206..81aad4a78 100644
--- a/src/client/spark/Daemons/SecurityPickerDaemon.cs
+++ b/src/client/spark/Daemons/SecurityPickerDaemon.cs
@@ -53,8 +53,8 @@ namespace bts {
}
//
void handle_bad_icon(string icon_error_desc) {
- Log.Api.warn($"{nameof(SecurityPickerDaemon)} received a message '{message.title}' with {icon_error_desc}, will use {nameof(Icons.AdminFrozen)}.");
- icon = Icons.AdminFrozen;
+ Log.Api.warn($"{nameof(SecurityPickerDaemon)} received a message '{message.title}' with {icon_error_desc}, will use {nameof(Icons.Admin)}.");
+ icon = Icons.Admin;
}
//
var cpv = new ContractPickerView(vm);
diff --git a/src/client/spark/Images/Icons.cs b/src/client/spark/Images/Icons.cs
index 944f73258..adc9118a4 100644
--- a/src/client/spark/Images/Icons.cs
+++ b/src/client/spark/Images/Icons.cs
@@ -16,11 +16,6 @@ namespace mbts.ui {
ToolsGeometryKey = nameof(ToolsGeometryKey),
DraggableGeometryKey = nameof(DraggableGeometryKey);
- static Icons() {
- // TODO: probably do this for all icons, only reason for holding back is the uncertainity of any unexpected impacts
- AdminFrozen = Admin.frozen();
- }
-
public static Geometry PlayGeometry => Geometry.Parse(_get_geometric_path(PlayGeometryKey).FirstOrDefault() ?? string.Empty);
static readonly string base_uri = "pack://application:,,,/Images/Icons/";
@@ -32,40 +27,43 @@ namespace mbts.ui {
[Obsolete("Please only add new vector icons using icons.xaml")]
private static ImageSource load_image(string filename) {
- return new BitmapImage(uri(filename));
+ return new BitmapImage(uri(filename)).frozen();
+ }
+
+ private static ImageSource load_resource_and_freeze(string resource_name) {
+ return ((DrawingImage)_resources[resource_name]).frozen();
}
#pragma warning disable CS0618 // Type or member is obsolete
public static ImageSource Logo { get { return load_image("logo.ico"); } }
- public static ImageSource Admin { get { return (DrawingImage)_resources["Admin"]; } }
- public static ImageSource AdminFrozen { get; }
- public static ImageSource Analytics { get { return (DrawingImage)_resources["Analytics"]; } }
- public static ImageSource Sheets { get { return (DrawingImage)_resources["Sheets"]; } }
- public static ImageSource Trades { get { return (DrawingImage)_resources["Trades"]; } }
- public static ImageSource Depth { get { return (DrawingImage)_resources["Depth"]; } }
- public static ImageSource Ladder { get { return (DrawingImage)_resources["Ladder"]; } }
+ public static ImageSource Admin { get { return load_resource_and_freeze("Admin"); } }
+ public static ImageSource Analytics { get { return load_resource_and_freeze("Analytics"); } }
+ public static ImageSource Sheets { get { return load_resource_and_freeze("Sheets"); } }
+ public static ImageSource Trades { get { return load_resource_and_freeze("Trades"); } }
+ public static ImageSource Depth { get { return load_resource_and_freeze("Depth"); } }
+ public static ImageSource Ladder { get { return load_resource_and_freeze("Ladder"); } }
public static ImageSource SheetsRed { get { return load_image("SheetsRed.png"); } }
public static ImageSource SheetsGreen { get { return load_image("SheetsGreen.png"); } }
- public static ImageSource Spreads { get { return (DrawingImage)_resources["Spreads"]; } }
+ public static ImageSource Spreads { get { return load_resource_and_freeze("Spreads"); } }
public static ImageSource BlueSpreads { get { return load_image("BlueSpread.ico"); } }
- public static ImageSource Reports { get { return (DrawingImage)_resources["Reports"]; } }
- public static ImageSource Risk { get { return (DrawingImage)_resources["Risk"]; } }
- public static ImageSource Eye { get { return (DrawingImage)_resources["Eye"]; } }
- public static ImageSource Coins { get { return (DrawingImage)_resources["Coins"]; } }
+ public static ImageSource Reports { get { return load_resource_and_freeze("Reports"); } }
+ public static ImageSource Risk { get { return load_resource_and_freeze("Risk"); } }
+ public static ImageSource Eye { get { return load_resource_and_freeze("Eye"); } }
+ public static ImageSource Coins { get { return load_resource_and_freeze("Coins"); } }
public static ImageSource DataCopy { get { return load_image("DataCopy.ico"); } }
public static ImageSource Refresh { get { return load_image("Refresh.png"); } }
public static ImageSource FavoriteWindow { get { return load_image("FavoriteWindow.png"); } }
- public static ImageSource Browser => (DrawingImage)_resources["Browser"];
+ public static ImageSource Browser => load_resource_and_freeze("Browser");
public static ImageSource Date { get { return load_image("Date.png"); } }
- public static ImageSource Cube3d { get { return (DrawingImage)_resources["Cube"]; } }
+ public static ImageSource Cube3d { get { return load_resource_and_freeze("Cube"); } }
public static ImageSource Algo { get { return Cube3d; } }
public static ImageSource Quote { get { return Math; } }
- public static ImageSource Math { get { return (DrawingImage)_resources["Surface"]; } }
+ public static ImageSource Math { get { return load_resource_and_freeze("Surface"); } }
public static ImageSource Abacus { get { return load_image("Abacus.png"); } }
public static ImageSource Delete { get { return load_image("Delete.png"); } }
@@ -77,58 +75,58 @@ namespace mbts.ui {
#pragma warning restore CS0618
// Vector icons
- public static ImageSource Bookmarks { get { return (DrawingImage)_resources["Bookmarks"]; } }
- public static ImageSource Window { get { return (DrawingImage)_resources["Window"]; } }
- public static ImageSource ActiveWindow { get { return (DrawingImage)_resources["ActiveWindow"]; } }
- public static ImageSource Trash { get { return (DrawingImage)_resources["Trash"]; } }
- public static ImageSource Trash2 { get { return (DrawingImage)_resources["Trash2"]; } }
- public static ImageSource Crucible { get { return (DrawingImage)_resources["Crucible"]; } }
+ public static ImageSource Bookmarks { get { return load_resource_and_freeze("Bookmarks"); } }
+ public static ImageSource Window { get { return load_resource_and_freeze("Window"); } }
+ public static ImageSource ActiveWindow { get { return load_resource_and_freeze("ActiveWindow"); } }
+ public static ImageSource Trash { get { return load_resource_and_freeze("Trash"); } }
+ public static ImageSource Trash2 { get { return load_resource_and_freeze("Trash2"); } }
+ public static ImageSource Crucible { get { return load_resource_and_freeze("Crucible"); } }
- public static ImageSource Accounting { get { return (DrawingImage)_resources["Accounting"]; } }
- public static ImageSource Add { get { return (DrawingImage)_resources["Add"]; } }
- public static ImageSource AddEncircled { get { return (DrawingImage)_resources["AddEncircled"]; } }
- public static ImageSource Beaker { get { return (DrawingImage)_resources["Beaker"]; } }
- public static ImageSource Book { get { return (DrawingImage)_resources["Book"]; } }
+ public static ImageSource Accounting { get { return load_resource_and_freeze("Accounting"); } }
+ public static ImageSource Add { get { return load_resource_and_freeze("Add"); } }
+ public static ImageSource AddEncircled { get { return load_resource_and_freeze("AddEncircled"); } }
+ public static ImageSource Beaker { get { return load_resource_and_freeze("Beaker"); } }
+ public static ImageSource Book { get { return load_resource_and_freeze("Book"); } }
public static ImageSource Orders => create_icon(OrdersGeometryKey);
- public static ImageSource AddOrders { get { return (DrawingImage)_resources["AddOrders"]; } }
- public static ImageSource CancelOrders { get { return (DrawingImage)_resources["CancelOrders"]; } }
- public static ImageSource CancelBuys { get { return (DrawingImage)_resources["CancelBuys"]; } }
- public static ImageSource CancelSells { get { return (DrawingImage)_resources["CancelSells"]; } }
- public static ImageSource CancelSelected { get { return (DrawingImage)_resources["CancelSelected"]; } }
+ public static ImageSource AddOrders { get { return load_resource_and_freeze("AddOrders"); } }
+ public static ImageSource CancelOrders { get { return load_resource_and_freeze("CancelOrders"); } }
+ public static ImageSource CancelBuys { get { return load_resource_and_freeze("CancelBuys"); } }
+ public static ImageSource CancelSells { get { return load_resource_and_freeze("CancelSells"); } }
+ public static ImageSource CancelSelected { get { return load_resource_and_freeze("CancelSelected"); } }
- public static ImageSource LadderCancelOrders { get { return (DrawingImage)_resources["LadderCancelOrders"]; } }
- public static ImageSource LadderCancelBuys { get { return (DrawingImage)_resources["LadderCancelBuys"]; } }
- public static ImageSource LadderCancelSells { get { return (DrawingImage)_resources["LadderCancelSells"]; } }
+ public static ImageSource LadderCancelOrders { get { return load_resource_and_freeze("LadderCancelOrders"); } }
+ public static ImageSource LadderCancelBuys { get { return load_resource_and_freeze("LadderCancelBuys"); } }
+ public static ImageSource LadderCancelSells { get { return load_resource_and_freeze("LadderCancelSells"); } }
- public static ImageSource Synthetics { get { return (DrawingImage)_resources["Synthetics"]; } }
- public static ImageSource AddSynthetic { get { return (DrawingImage)_resources["AddSynthetic"]; } }
- public static ImageSource RemoveSynthetic { get { return (DrawingImage)_resources["RemoveSynthetic"]; } }
- public static ImageSource ModifySynthetic { get { return (DrawingImage)_resources["ModifySynthetic"]; } }
- public static ImageSource CloneSynthetic { get { return (DrawingImage)_resources["CloneSynthetic"]; } }
+ public static ImageSource Synthetics { get { return load_resource_and_freeze("Synthetics"); } }
+ public static ImageSource AddSynthetic { get { return load_resource_and_freeze("AddSynthetic"); } }
+ public static ImageSource RemoveSynthetic { get { return load_resource_and_freeze("RemoveSynthetic"); } }
+ public static ImageSource ModifySynthetic { get { return load_resource_and_freeze("ModifySynthetic"); } }
+ public static ImageSource CloneSynthetic { get { return load_resource_and_freeze("CloneSynthetic"); } }
- public static ImageSource ModifyOrder { get { return (DrawingImage)_resources["ModifyOrder"]; } }
- public static ImageSource Clock { get { return (DrawingImage)_resources["Clock"]; } }
- public static ImageSource Defrag { get { return (DrawingImage)_resources["Defrag"]; } }
- public static ImageSource Display { get { return (DrawingImage)_resources["Display"]; } }
+ public static ImageSource ModifyOrder { get { return load_resource_and_freeze("ModifyOrder"); } }
+ public static ImageSource Clock { get { return load_resource_and_freeze("Clock"); } }
+ public static ImageSource Defrag { get { return load_resource_and_freeze("Defrag"); } }
+ public static ImageSource Display { get { return load_resource_and_freeze("Display"); } }
public static ImageSource Draggable => create_icon(DraggableGeometryKey);
- public static ImageSource Export => (DrawingImage)_resources["Export"];
- public static ImageSource Filter { get { return (DrawingImage)_resources["Filter"]; } }
- public static ImageSource FilterActive { get { return (DrawingImage)_resources["FilterActive"]; } }
- public static ImageSource FilterError { get { return (DrawingImage)_resources["FilterError"]; } }
+ public static ImageSource Export => load_resource_and_freeze("Export");
+ public static ImageSource Filter { get { return load_resource_and_freeze("Filter"); } }
+ public static ImageSource FilterActive { get { return load_resource_and_freeze("FilterActive"); } }
+ public static ImageSource FilterError { get { return load_resource_and_freeze("FilterError"); } }
public static ImageSource Gear => create_icon(GearGeometryKey);
- public static ImageSource Import => (DrawingImage)_resources["Import"];
- public static ImageSource Knight { get { return (DrawingImage)_resources["Knight"]; } }
+ public static ImageSource Import => load_resource_and_freeze("Import");
+ public static ImageSource Knight { get { return load_resource_and_freeze("Knight"); } }
public static ImageSource Payment => create_icon(PaymentGeometryKey);
- public static ImageSource Spawn { get { return (DrawingImage)_resources["Spawn"]; } }
- public static ImageSource Target { get { return (DrawingImage)_resources["Target"]; } }
- public static ImageSource Tetris { get { return (DrawingImage)_resources["Tetris"]; } }
+ public static ImageSource Spawn { get { return load_resource_and_freeze("Spawn"); } }
+ public static ImageSource Target { get { return load_resource_and_freeze("Target"); } }
+ public static ImageSource Tetris { get { return load_resource_and_freeze("Tetris"); } }
public static ImageSource Tools => create_icon(ToolsGeometryKey);
- public static ImageSource ViewSettings => (DrawingImage)_resources["ViewSettings"];
- public static ImageSource Wrench { get { return (DrawingImage)_resources["Wrench"]; } }
- public static ImageSource RightArrow { get { return ((DrawingImage)_resources["RightArrow"]); } }
- public static ImageSource DownArrow { get { return ((DrawingImage)_resources["DownArrow"]); } }
- public static ImageSource Support => (DrawingImage)_resources["SupportIcon"];
+ public static ImageSource ViewSettings => load_resource_and_freeze("ViewSettings");
+ public static ImageSource Wrench { get { return load_resource_and_freeze("Wrench"); } }
+ public static ImageSource RightArrow { get { return (load_resource_and_freeze("RightArrow")); } }
+ public static ImageSource DownArrow { get { return (load_resource_and_freeze("DownArrow")); } }
+ public static ImageSource Support => load_resource_and_freeze("SupportIcon");
public static ImageSource create_icon(string geometric_path_key) =>
create_icon(geometric_path_key, Brushes.Black);
diff --git a/src/client/spark/Modules/Settings/SettingsShellModule.cs b/src/client/spark/Modules/Settings/SettingsShellModule.cs
index a5dafb9e4..005dd648b 100644
--- a/src/client/spark/Modules/Settings/SettingsShellModule.cs
+++ b/src/client/spark/Modules/Settings/SettingsShellModule.cs
@@ -42,7 +42,7 @@ namespace bts.ui {
_bus = bus;
}
- public ImageSource icon => Icons.AdminFrozen;
+ public ImageSource icon => Icons.Admin;
public string name => "Settings";
diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookCell.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookCell.cs
index 36c27d336..22d8b2808 100644
--- a/src/client/spark/Modules/Trading/OrderBook/OrderBookCell.cs
+++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookCell.cs
@@ -47,7 +47,7 @@ namespace mbts.spark {
where T : struct =>
new OrderBookCellStore