Mercurial > octave
changeset 22860:0b1e25cc4457
eliminate use of OCTAVE_QUIT macro in C++ sources
* __dsearchn__.cc, __magick_read__.cc, filter.cc, find.cc,
graphics.cc, quadcc.cc, qz.cc, tsearch.cc audiodevinfo.cc, symrcm.cc,
op-int.h, lo-regexp.cc: Use inline octave_quit function instead of
OCTAVE_QUIT macro.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sat, 03 Dec 2016 07:12:10 -0500 |
| parents | adc66f043cfc |
| children | 0ab9c3548b1f |
| files | libinterp/corefcn/__dsearchn__.cc libinterp/corefcn/__magick_read__.cc libinterp/corefcn/filter.cc libinterp/corefcn/find.cc libinterp/corefcn/graphics.cc libinterp/corefcn/quadcc.cc libinterp/corefcn/qz.cc libinterp/corefcn/tsearch.cc libinterp/dldfcn/audiodevinfo.cc libinterp/dldfcn/symrcm.cc libinterp/operators/op-int.h liboctave/util/lo-regexp.cc |
| diffstat | 12 files changed, 92 insertions(+), 61 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/__dsearchn__.cc Fri Dec 02 13:49:53 2016 -0500 +++ b/libinterp/corefcn/__dsearchn__.cc Sat Dec 03 07:12:10 2016 -0500 @@ -84,7 +84,7 @@ d0 = d; *pidx = static_cast<double>(j + 1); } - OCTAVE_QUIT; + octave_quit (); } *pdist++ = d0;
--- a/libinterp/corefcn/__magick_read__.cc Fri Dec 02 13:49:53 2016 -0500 +++ b/libinterp/corefcn/__magick_read__.cc Sat Dec 03 07:12:10 2016 -0500 @@ -246,7 +246,8 @@ octave_idx_type idx = 0; for (octave_idx_type frame = 0; frame < nFrames; frame++) { - OCTAVE_QUIT; + octave_quit (); + imvec[frameidx(frame)].getConstPixels (col_start, row_start, col_cache, row_cache); @@ -451,7 +452,8 @@ octave_idx_type idx = 0; for (octave_idx_type frame = 0; frame < nFrames; frame++) { - OCTAVE_QUIT; + octave_quit (); + const Magick::PixelPacket *pix = imvec[frameidx(frame)].getConstPixels (col_start, row_start, col_cache, row_cache); @@ -479,7 +481,8 @@ octave_idx_type idx = 0; for (octave_idx_type frame = 0; frame < nFrames; frame++) { - OCTAVE_QUIT; + octave_quit (); + const Magick::PixelPacket *pix = imvec[frameidx(frame)].getConstPixels (col_start, row_start, col_cache, row_cache); @@ -509,7 +512,8 @@ const octave_idx_type frame_stride = color_stride * 3; for (octave_idx_type frame = 0; frame < nFrames; frame++) { - OCTAVE_QUIT; + octave_quit (); + const Magick::PixelPacket *pix = imvec[frameidx(frame)].getConstPixels (col_start, row_start, col_cache, row_cache); @@ -551,7 +555,8 @@ octave_idx_type a_idx = 0; for (octave_idx_type frame = 0; frame < nFrames; frame++) { - OCTAVE_QUIT; + octave_quit (); + const Magick::PixelPacket *pix = imvec[frameidx(frame)].getConstPixels (col_start, row_start, col_cache, row_cache); @@ -588,7 +593,8 @@ const octave_idx_type frame_stride = color_stride * 4; for (octave_idx_type frame = 0; frame < nFrames; frame++) { - OCTAVE_QUIT; + octave_quit (); + const Magick::PixelPacket *pix = imvec[frameidx(frame)].getConstPixels (col_start, row_start, col_cache, row_cache); @@ -632,7 +638,8 @@ octave_idx_type a_idx = 0; for (octave_idx_type frame = 0; frame < nFrames; frame++) { - OCTAVE_QUIT; + octave_quit (); + const Magick::PixelPacket *pix = imvec[frameidx(frame)].getConstPixels (col_start, row_start, col_cache, row_cache); @@ -957,7 +964,8 @@ for (octave_idx_type frame = 0; frame < nFrames; frame++) { - OCTAVE_QUIT; + octave_quit (); + Magick::Image m_img = init_enconde_image (nCols, nRows, bitdepth, Magick::PaletteType, Magick::PseudoClass); @@ -1013,7 +1021,8 @@ octave_idx_type img_idx = 0; for (octave_idx_type frame = 0; frame < nFrames; frame++) { - OCTAVE_QUIT; + octave_quit (); + // For some reason, we can't set the type to Magick::BilevelType or // the output image will be black, changing to white has no effect. // However, this will still work fine and a binary image will be @@ -1105,7 +1114,8 @@ { for (octave_idx_type frame = 0; frame < nFrames; frame++) { - OCTAVE_QUIT; + octave_quit (); + Magick::Image m_img = init_enconde_image (nCols, nRows, bitdepth, type, Magick::DirectClass); @@ -1135,7 +1145,8 @@ { for (octave_idx_type frame = 0; frame < nFrames; frame++) { - OCTAVE_QUIT; + octave_quit (); + Magick::Image m_img = init_enconde_image (nCols, nRows, bitdepth, type, Magick::DirectClass); @@ -1170,7 +1181,8 @@ const octave_idx_type B_offset = nCols * nRows * 2; for (octave_idx_type frame = 0; frame < nFrames; frame++) { - OCTAVE_QUIT; + octave_quit (); + Magick::Image m_img = init_enconde_image (nCols, nRows, bitdepth, type, Magick::DirectClass); @@ -1205,7 +1217,8 @@ const octave_idx_type B_offset = nCols * nRows * 2; for (octave_idx_type frame = 0; frame < nFrames; frame++) { - OCTAVE_QUIT; + octave_quit (); + Magick::Image m_img = init_enconde_image (nCols, nRows, bitdepth, type, Magick::DirectClass); @@ -1243,7 +1256,8 @@ const octave_idx_type K_offset = nCols * nRows * 3; for (octave_idx_type frame = 0; frame < nFrames; frame++) { - OCTAVE_QUIT; + octave_quit (); + Magick::Image m_img = init_enconde_image (nCols, nRows, bitdepth, type, Magick::DirectClass); @@ -1280,7 +1294,8 @@ const octave_idx_type K_offset = nCols * nRows * 3; for (octave_idx_type frame = 0; frame < nFrames; frame++) { - OCTAVE_QUIT; + octave_quit (); + Magick::Image m_img = init_enconde_image (nCols, nRows, bitdepth, type, Magick::DirectClass); @@ -1922,7 +1937,8 @@ for (octave_idx_type frame = 0; frame < nFrames; frame++) { - OCTAVE_QUIT; + octave_quit (); + octave_scalar_map info_frame (template_info); const Magick::Image img = imvec[frame];
--- a/libinterp/corefcn/filter.cc Fri Dec 02 13:49:53 2016 -0500 +++ b/libinterp/corefcn/filter.cc Sat Dec 03 07:12:10 2016 -0500 @@ -147,7 +147,7 @@ { for (octave_idx_type j = 0; j < si_len - 1; j++) { - OCTAVE_QUIT; + octave_quit (); psi[j] = psi[j+1] - pa[j+1] * py[idx] + pb[j+1] * px[idx]; } @@ -156,7 +156,7 @@ } else { - OCTAVE_QUIT; + octave_quit (); psi[0] = pb[si_len] * px[idx] - pa[si_len] * py[idx]; } @@ -182,7 +182,7 @@ { for (octave_idx_type j = 0; j < si_len - 1; j++) { - OCTAVE_QUIT; + octave_quit (); psi[j] = psi[j+1] + pb[j+1] * px[idx]; } @@ -191,7 +191,7 @@ } else { - OCTAVE_QUIT; + octave_quit (); psi[0] = pb[1] * px[idx]; }
--- a/libinterp/corefcn/find.cc Fri Dec 02 13:49:53 2016 -0500 +++ b/libinterp/corefcn/find.cc Sat Dec 03 07:12:10 2016 -0500 @@ -111,7 +111,8 @@ { for (octave_idx_type j = 0; j < nc; j++) { - OCTAVE_QUIT; + octave_quit (); + if (v.cidx (j) == 0 && v.cidx (j+1) != 0) start_nc = j; if (v.cidx (j+1) >= n_to_find) @@ -125,7 +126,8 @@ { for (octave_idx_type j = nc; j > 0; j--) { - OCTAVE_QUIT; + octave_quit (); + if (v.cidx (j) == nz && v.cidx (j-1) != nz) end_nc = j; if (nz - v.cidx (j-1) >= n_to_find) @@ -169,7 +171,8 @@ for (octave_idx_type j = start_nc, cx = 0; j < end_nc; j++) for (octave_idx_type i = v.cidx (j); i < v.cidx (j+1); i++) { - OCTAVE_QUIT; + octave_quit (); + if (direction < 0 && i < nz - count) continue; i_idx(cx) = static_cast<double> (v.ridx (i) + 1); @@ -263,7 +266,8 @@ const Array<octave_idx_type>& p = v.col_perm_vec (); for (octave_idx_type k = 0; k < count; k++) { - OCTAVE_QUIT; + octave_quit (); + const octave_idx_type j = start_nc + k; const octave_idx_type i = p(j); i_idx(k) = static_cast<double> (1+i);
--- a/libinterp/corefcn/graphics.cc Fri Dec 02 13:49:53 2016 -0500 +++ b/libinterp/corefcn/graphics.cc Sat Dec 03 07:12:10 2016 -0500 @@ -11855,7 +11855,7 @@ octave_sleep (0.1); // FIXME: really needed? - OCTAVE_QUIT; + octave_quit (); octave::command_editor::run_event_hooks ();
--- a/libinterp/corefcn/quadcc.cc Fri Dec 02 13:49:53 2016 -0500 +++ b/libinterp/corefcn/quadcc.cc Sat Dec 03 07:12:10 2016 -0500 @@ -1753,7 +1753,7 @@ && err - err_final < fabs (igral) * tol)) { // Allow the user to interrupt. - OCTAVE_QUIT; + octave_quit (); // Put our finger on the interval with the largest error. iv = &(ivals[heap[0]]);
--- a/libinterp/corefcn/qz.cc Fri Dec 02 13:49:53 2016 -0500 +++ b/libinterp/corefcn/qz.cc Sat Dec 03 07:12:10 2016 -0500 @@ -354,7 +354,8 @@ for (octave_idx_type ii = 0; ii < nn; ii++) for (octave_idx_type jj = 0; jj < nn; jj++) { - OCTAVE_QUIT; + octave_quit (); + QQ(ii,jj) = ZZ(ii,jj) = (ii == jj ? 1.0 : 0.0); } @@ -924,7 +925,7 @@ while (jj < nn) { - OCTAVE_QUIT; + octave_quit (); // See if real or complex eigenvalue.
--- a/libinterp/corefcn/tsearch.cc Fri Dec 02 13:49:53 2016 -0500 +++ b/libinterp/corefcn/tsearch.cc Sat Dec 03 07:12:10 2016 -0500 @@ -126,7 +126,8 @@ // it doesn't, so go through all elements for (k = 0; k < nelem; k++) { - OCTAVE_QUIT; + octave_quit (); + if (xt >= minx(k) && xt <= maxx(k) && yt >= miny(k) && yt <= maxy(k)) { // element inside the minimum rectangle: examine it closely
--- a/libinterp/dldfcn/audiodevinfo.cc Fri Dec 02 13:49:53 2016 -0500 +++ b/libinterp/dldfcn/audiodevinfo.cc Sat Dec 03 07:12:10 2016 -0500 @@ -1108,7 +1108,8 @@ for (unsigned int i = start; i < end; i += buffer_size) { - OCTAVE_QUIT; + octave_quit (); + if (octave_callback_function != 0) octave_play_callback (0, buffer, buffer_size, 0, 0, this); else @@ -1728,7 +1729,8 @@ for (unsigned int i = 0; i < frames; i += buffer_size) { - OCTAVE_QUIT; + octave_quit (); + Pa_ReadStream (get_stream (), buffer, buffer_size); if (octave_callback_function != 0)
--- a/libinterp/dldfcn/symrcm.cc Fri Dec 02 13:49:53 2016 -0500 +++ b/libinterp/dldfcn/symrcm.cc Sat Dec 03 07:12:10 2016 -0500 @@ -230,7 +230,7 @@ octave_idx_type j2 = cidx2[i]; while (j1 < cidx[i+1] || j2 < cidx2[i+1]) { - OCTAVE_QUIT; + octave_quit (); if (j1 == cidx[i+1]) { @@ -339,7 +339,8 @@ { for (octave_idx_type i = cidx[j]; i < cidx[j+1]; i++) { - OCTAVE_QUIT; + octave_quit (); + octave_idx_type k = ridx[i]; // there is a nonzero element (k,j) D[k]++; @@ -352,7 +353,7 @@ bool found = false; for (octave_idx_type l = cidx[k]; l < cidx[k + 1]; l++) { - OCTAVE_QUIT; + octave_quit (); if (ridx[l] == j) { @@ -393,7 +394,8 @@ nz = 0; for (octave_idx_type i = 0; i < N; i++) { - OCTAVE_QUIT; + octave_quit (); + cidx2[i] = nz; nz += w[i]; w[i] = cidx2[i]; @@ -404,7 +406,8 @@ for (octave_idx_type j = 0; j < N; j++) for (octave_idx_type k = cidx[j]; k < cidx[j + 1]; k++) { - OCTAVE_QUIT; + octave_quit (); + octave_idx_type q = w[ridx[k]]++; ridx2[q] = j; } @@ -575,10 +578,12 @@ octave_idx_type j1 = cidx[i]; octave_idx_type j2 = cidx2[i]; - OCTAVE_QUIT; + octave_quit (); + while (j1 < cidx[i+1] || j2 < cidx2[i+1]) { - OCTAVE_QUIT; + octave_quit (); + if (j1 == cidx[i+1]) { octave_idx_type r2 = ridx2[j2++]; @@ -640,7 +645,7 @@ // add the neighbors to the queue (sorted by node degree) while (! H_empty (S, s)) { - OCTAVE_QUIT; + octave_quit (); // locate a neighbor of i with minimal degree in O(log(N)) v = H_remove_min (S, s, 1);
--- a/libinterp/operators/op-int.h Fri Dec 02 13:49:53 2016 -0500 +++ b/libinterp/operators/op-int.h Sat Dec 03 07:12:10 2016 -0500 @@ -399,7 +399,7 @@ T2 ## NDArray result (b.dims ()); \ for (int i = 0; i < b.numel (); i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ result (i) = pow (a, b(i)); \ } \ return octave_value (result); \ @@ -411,7 +411,7 @@ T1 ## NDArray result (b.dims ()); \ for (int i = 0; i < b.numel (); i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ result (i) = pow (a, b(i)); \ } \ return octave_value (result); \ @@ -423,7 +423,7 @@ T2 ## NDArray result (b.dims ()); \ for (int i = 0; i < b.numel (); i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ result (i) = pow (a, b(i)); \ } \ return octave_value (result); \ @@ -435,7 +435,7 @@ T1 ## NDArray result (b.dims ()); \ for (int i = 0; i < b.numel (); i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ result (i) = powf (a, b(i)); \ } \ return octave_value (result); \ @@ -447,7 +447,7 @@ T2 ## NDArray result (b.dims ()); \ for (int i = 0; i < b.numel (); i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ result (i) = powf (a, b(i)); \ } \ return octave_value (result); \ @@ -568,7 +568,7 @@ T1 ## NDArray result (a.dims ()); \ for (int i = 0; i < a.numel (); i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ result (i) = pow (a(i), b); \ } \ return octave_value (result); \ @@ -579,7 +579,7 @@ T1 ## NDArray result (a.dims ()); \ for (int i = 0; i < a.numel (); i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ result (i) = pow (a(i), b); \ } \ return octave_value (result); \ @@ -590,7 +590,7 @@ T2 ## NDArray result (a.dims ()); \ for (int i = 0; i < a.numel (); i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ result (i) = pow (a(i), b); \ } \ return octave_value (result); \ @@ -601,7 +601,7 @@ T1 ## NDArray result (a.dims ()); \ for (int i = 0; i < a.numel (); i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ result (i) = powf (a(i), b); \ } \ return octave_value (result); \ @@ -612,7 +612,7 @@ T2 ## NDArray result (a.dims ()); \ for (int i = 0; i < a.numel (); i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ result (i) = powf (a(i), b); \ } \ return octave_value (result); \ @@ -738,7 +738,7 @@ T1 ## NDArray result (a_dims); \ for (int i = 0; i < a.numel (); i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ result (i) = pow (a(i), b(i)); \ } \ return octave_value (result); \ @@ -759,7 +759,7 @@ T1 ## NDArray result (a_dims); \ for (int i = 0; i < a.numel (); i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ result (i) = pow (a(i), b(i)); \ } \ return octave_value (result); \ @@ -780,7 +780,7 @@ T2 ## NDArray result (a_dims); \ for (int i = 0; i < a.numel (); i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ result (i) = pow (a(i), b(i)); \ } \ return octave_value (result); \ @@ -801,7 +801,7 @@ T1 ## NDArray result (a_dims); \ for (int i = 0; i < a.numel (); i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ result (i) = powf (a(i), b(i)); \ } \ return octave_value (result); \ @@ -822,7 +822,7 @@ T2 ## NDArray result (a_dims); \ for (int i = 0; i < a.numel (); i++) \ { \ - OCTAVE_QUIT; \ + octave_quit (); \ result (i) = powf (a(i), b(i)); \ } \ return octave_value (result); \
--- a/liboctave/util/lo-regexp.cc Fri Dec 02 13:49:53 2016 -0500 +++ b/liboctave/util/lo-regexp.cc Sat Dec 03 07:12:10 2016 -0500 @@ -270,7 +270,7 @@ while (true) { - OCTAVE_QUIT; + octave_quit (); int matches = pcre_exec (re, 0, buffer.c_str (), buffer.length (), idx, @@ -296,7 +296,7 @@ while (matches == PCRE_ERROR_MATCHLIMIT && i++ < PCRE_MATCHLIMIT_MAX) { - OCTAVE_QUIT; + octave_quit (); pe.match_limit *= 10; matches = pcre_exec (re, &pe, buffer.c_str (), @@ -511,7 +511,7 @@ regexp::match_data::const_iterator p = rx_lst.begin (); for (size_t i = 0; i < num_matches; i++) { - OCTAVE_QUIT; + octave_quit (); double start = p->start (); double end = p->end (); @@ -537,7 +537,7 @@ p = rx_lst.begin (); for (size_t i = 0; i < num_matches; i++) { - OCTAVE_QUIT; + octave_quit (); double start = p->start (); double end = p->end (); @@ -587,7 +587,8 @@ regexp::match_data::const_iterator p = rx_lst.begin (); for (size_t i = 0; i < num_matches; i++) { - OCTAVE_QUIT; + octave_quit (); + delta += static_cast<int> (replen) - static_cast<int> (p->end () - p->start () + 1); p++; @@ -599,7 +600,8 @@ p = rx_lst.begin (); for (size_t i = 0; i < num_matches; i++) { - OCTAVE_QUIT; + octave_quit (); + rep.append (&buffer[from], static_cast<size_t> (p->start () - 1) - from); from = static_cast<size_t> (p->end ());