[education/rkward] rkward: Tone down some particularily verbose debug messages

Thomas Friedrichsmeier null at kde.org
Sun May 12 16:32:29 BST 2024


Git commit b3dd059e8726c7477de3590ab863d95ba16b885e by Thomas Friedrichsmeier.
Committed on 11/05/2024 at 21:18.
Pushed by tfry into branch 'master'.

Tone down some particularily verbose debug messages

M  +1    -1    rkward/debug.h
M  +4    -4    rkward/rbackend/rkstructuregetter.cpp
M  +1    -1    rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp

https://invent.kde.org/education/rkward/-/commit/b3dd059e8726c7477de3590ab863d95ba16b885e

diff --git a/rkward/debug.h b/rkward/debug.h
index cd7c2cd7f..903a3030c 100644
--- a/rkward/debug.h
+++ b/rkward/debug.h
@@ -31,7 +31,7 @@ void RKDebug (int flags, int level, const char *fmt, ...);
 #define OUTPUT 1 << 10
 #define XML 1 << 11
 #define GRAPHICS_DEVICE 1 << 12
-#define DEBUG_ALL (APP | PLUGIN | PHP | OBJECTS | EDITOR | RBACKEND | COMMANDEDITOR | MISC | DIALOGS | OUTPUT | XML | GRAPHICS_DEVICE)
+#define DEBUG_ALL (APP | PLUGIN | PHP | OBJECTS | EDITOR | SETTINGS | RBACKEND | COMMANDEDITOR | MISC | DIALOGS | OUTPUT | XML | GRAPHICS_DEVICE)
 
 #ifdef RKWARD_DEBUG
 // Debug functions 
diff --git a/rkward/rbackend/rkstructuregetter.cpp b/rkward/rbackend/rkstructuregetter.cpp
index 8a107bdc1..94ffbdee4 100644
--- a/rkward/rbackend/rkstructuregetter.cpp
+++ b/rkward/rbackend/rkstructuregetter.cpp
@@ -139,9 +139,9 @@ SEXP RKStructureGetter::resolvePromise (SEXP from) {
 	if (RFn::TYPEOF (from) == PROMSXP) {
 		ret = RFn::PRVALUE(from);
 		if (ret == ROb(R_UnboundValue)) {
-			RK_DEBUG (RBACKEND, DL_DEBUG, "temporarily resolving unbound promise");
+			RK_DEBUG(RBACKEND, DL_TRACE, "temporarily resolving unbound promise");
 
-			RFn::Rf_protect (from);
+			RFn::Rf_protect(from);
 			//SET_PRSEEN(from, 1);  // NOTE: SET_PRSEEN was removed from Rinternals.h in R 4.2.0. Its only use is to prevent recursion, however.
 			                        //       Not setting it from here, only means, any recursion will be detected one level later.
 			ret = RFn::Rf_eval(RFn::PRCODE(from), RFn::PRENV(from));
@@ -152,7 +152,7 @@ SEXP RKStructureGetter::resolvePromise (SEXP from) {
 			}
 			RFn::Rf_unprotect (1);
 
-			RK_DEBUG (RBACKEND, DL_DEBUG, "resolved type is %d", RFn::TYPEOF (ret));
+			RK_DEBUG(RBACKEND, DL_TRACE, "resolved type is %d", RFn::TYPEOF(ret));
 		}
 	}
 
@@ -170,7 +170,7 @@ void RKStructureGetter::getStructureWorker (SEXP val, const QString &name, int a
 	bool no_recurse = (nesting_depth >= 2);	// TODO: should be configurable
 	unsigned int type = 0;
 
-	RK_DEBUG (RBACKEND, DL_DEBUG, "fetching '%s': %p, s-type %d", name.toLatin1().data(), val, RFn::TYPEOF (val));
+	RK_DEBUG(RBACKEND, DL_TRACE, "fetching '%s': %p, s-type %d", name.toLatin1().data(), val, RFn::TYPEOF (val));
 
 	SEXP value = val;
 	PROTECT_INDEX value_index;
diff --git a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp
index 70213c7ea..c810dc515 100644
--- a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp
+++ b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp
@@ -226,7 +226,7 @@ void RKGraphicsDeviceFrontendTransmitter::newData () {
 
 		quint8 opcode, devnum;
 		streamer.instream >> opcode >> devnum;
-		RK_DEBUG (GRAPHICS_DEVICE, DL_DEBUG, "Received transmission of type %d, devnum %d, size %d", opcode, devnum+1, streamer.inSize ());
+		RK_DEBUG(GRAPHICS_DEVICE, DL_TRACE, "Received transmission of type %d, devnum %d, size %d", opcode, devnum+1, streamer.inSize ());
 
 		RKGraphicsDevice *device = nullptr;
 		if (devnum && opcode == RKDCreate) {



More information about the rkward-tracker mailing list