Squashed commit of the sb-vbs branch.

Includes the SD-VBS benchmarks modified to:
- Use libextra to loop as realtime jobs
- Preallocate memory before starting their main computation
- Accept input via stdin instead of via argc

Does not include the SD-VBS matlab code.

Fixes libextra execution in LITMUS^RT.

1 files changed, 216 insertions, 0 deletions

diff --git a/SD-VBS/common/toolbox/toolbox_basic/calib_bouguetj/ginput3.m b/SD-VBS/common/toolbox/toolbox_basic/calib_bouguetj/ginput3.m
new file mode 100755
index 0000000..56fe496
--- /dev/null
+++ b/SD-VBS/common/toolbox/toolbox_basic/calib_bouguetj/ginput3.m
@@ -0,0 +1,216 @@
+function [out1,out2,out3] = ginput2(arg1)
+%GINPUT Graphical input from mouse.
+%   [X,Y] = GINPUT(N) gets N points from the current axes and returns 
+%   the X- and Y-coordinates in length N vectors X and Y.  The cursor
+%   can be positioned using a mouse (or by using the Arrow Keys on some 
+%   systems).  Data points are entered by pressing a mouse button
+%   or any key on the keyboard except carriage return, which terminates
+%   the input before N points are entered.
+%
+%   [X,Y] = GINPUT gathers an unlimited number of points until the
+%   return key is pressed.
+% 
+%   [X,Y,BUTTON] = GINPUT(N) returns a third result, BUTTON, that 
+%   contains a vector of integers specifying which mouse button was
+%   used (1,2,3 from left) or ASCII numbers if a key on the keyboard
+%   was used.
+
+%   Copyright (c) 1984-96 by The MathWorks, Inc.
+%   $Revision: 5.18 $  $Date: 1996/11/10 17:48:08 $
+
+% Fixed version by Jean-Yves Bouguet to have a cross instead of 2 lines
+% More visible for images
+
+P = NaN*ones(16,16);
+P(1:15,1:15) = 2*ones(15,15);
+P(2:14,2:14) = ones(13,13);
+P(3:13,3:13) = NaN*ones(11,11);
+P(6:10,6:10) = 2*ones(5,5);
+P(7:9,7:9) = 1*ones(3,3);
+
+out1 = []; out2 = []; out3 = []; y = [];
+c = computer;
+if ~strcmp(c(1:2),'PC') & ~strcmp(c(1:2),'MA')
+    tp = get(0,'TerminalProtocol');
+else
+    tp = 'micro';
+end
+
+if ~strcmp(tp,'none') & ~strcmp(tp,'x') & ~strcmp(tp,'micro'),
+    if nargout == 1,
+        if nargin == 1,
+            eval('out1 = trmginput(arg1);');
+        else
+            eval('out1 = trmginput;');
+        end
+    elseif nargout == 2 | nargout == 0,
+        if nargin == 1,
+            eval('[out1,out2] = trmginput(arg1);');
+        else
+            eval('[out1,out2] = trmginput;');
+        end
+        if  nargout == 0
+            out1 = [ out1 out2 ];
+        end
+    elseif nargout == 3,
+        if nargin == 1,
+            eval('[out1,out2,out3] = trmginput(arg1);');
+        else
+            eval('[out1,out2,out3] = trmginput;');
+        end
+    end
+else
+
+    fig = gcf;
+    figure(gcf);
+
+    if nargin == 0
+        how_many = -1;
+        b = [];
+    else
+        how_many = arg1;
+        b = [];
+        if  isstr(how_many) ...
+            | size(how_many,1) ~= 1 | size(how_many,2) ~= 1 ...
+            | ~(fix(how_many) == how_many) ...
+            | how_many < 0
+            error('Requires a positive integer.')
+        end
+        if how_many == 0
+            ptr_fig = 0;
+            while(ptr_fig ~= fig)
+                ptr_fig = get(0,'PointerWindow');
+            end
+            scrn_pt = get(0,'PointerLocation');
+            loc = get(fig,'Position');
+            pt = [scrn_pt(1) - loc(1), scrn_pt(2) - loc(2)];
+            out1 = pt(1); y = pt(2);
+        elseif how_many < 0
+            error('Argument must be a positive integer.')
+        end
+    end
+
+pointer = get(gcf,'pointer');
+
+set(gcf,'Pointer','custom','PointerShapeCData',P,'PointerShapeHotSpot',[8,8]);
+%set(gcf,'pointer','crosshair');
+    fig_units = get(fig,'units');
+    char = 0;
+
+    while how_many ~= 0
+        % Use no-side effect WAITFORBUTTONPRESS
+        waserr = 0;
+        eval('keydown = wfbp;', 'waserr = 1;');
+        if(waserr == 1)
+      if(ishandle(fig))
+        set(fig,'pointer',pointer,'units',fig_units);
+        error('Interrupted');
+      else
+        error('Interrupted by figure deletion');
+      end
+        end
+      
+        ptr_fig = get(0,'CurrentFigure');
+        if(ptr_fig == fig)
+            if keydown
+                char = get(fig, 'CurrentCharacter');
+                button = abs(get(fig, 'CurrentCharacter'));
+                scrn_pt = get(0, 'PointerLocation');
+                set(fig,'units','pixels')
+                loc = get(fig, 'Position');
+                pt = [scrn_pt(1) - loc(1), scrn_pt(2) - loc(2)];
+                set(fig,'CurrentPoint',pt);
+            else
+                button = get(fig, 'SelectionType');
+                if strcmp(button,'open')
+                    button = b(length(b));
+                elseif strcmp(button,'normal')
+                    button = 1;
+                elseif strcmp(button,'extend')
+                    button = 2;
+                elseif strcmp(button,'alt')
+                    button = 3;
+                else
+                    error('Invalid mouse selection.')
+                end
+            end
+            pt = get(gca, 'CurrentPoint');
+
+            how_many = how_many - 1;
+
+            if(char == 13) % & how_many ~= 0)
+                % if the return key was pressed, char will == 13,
+                % and that's our signal to break out of here whether
+                % or not we have collected all the requested data
+                % points.  
+                % If this was an early breakout, don't include
+                % the <Return> key info in the return arrays.
+                % We will no longer count it if it's the last input.
+                break;
+            end
+
+            out1 = [out1;pt(1,1)];
+            y = [y;pt(1,2)];
+            b = [b;button];
+        end
+    end
+
+    set(fig,'pointer',pointer,'units',fig_units);
+
+    if nargout > 1
+        out2 = y;
+        if nargout > 2
+            out3 = b;
+        end
+    else
+        out1 = [out1 y];
+    end
+
+end
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+function key = wfbp
+%WFBP   Replacement for WAITFORBUTTONPRESS that has no side effects.
+
+% Remove figure button functions
+fprops = {'windowbuttonupfcn','buttondownfcn', ...
+          'windowbuttondownfcn','windowbuttonmotionfcn'};