Skip to content

[http] use more efficient TMethodCall invocation #22549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
linev merged 3 commits into from
Jun 10, 2026
Merged

[http] use more efficient TMethodCall invocation #22549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c3c3f1
[http] use more efficient TMethodCall invocation
linev Jun 9, 2026
34add66
[http] keep cache for TMethodCall objects
linev Jun 10, 2026
da0af8d
[http] extend test_sniffer.cxx
linev Jun 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion net/http/inc/TRootSniffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ class TRootSniffer : public TNamed {

virtual void ScanRoot(TRootSnifferScanRec &rec);

TString DecodeUrlOptionValue(const char *value, Bool_t remove_quotes = kTRUE);
TString DecodeUrlOptionValue(const char *value, Bool_t remove_quotes = kTRUE, Bool_t escape_special = kTRUE);

TObject *GetItem(const char *fullname, TFolder *&parent, Bool_t force = kFALSE, Bool_t within_objects = kTRUE);

Expand Down
5 changes: 4 additions & 1 deletion net/http/src/TRootSniffer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1319,7 +1319,7 @@ Bool_t TRootSniffer::ProduceXml(const std::string &/* path */, const std::string
////////////////////////////////////////////////////////////////////////////////
/// Method replaces all kind of special symbols, which could appear in URL options

TString TRootSniffer::DecodeUrlOptionValue(const char *value, Bool_t remove_quotes)
TString TRootSniffer::DecodeUrlOptionValue(const char *value, Bool_t remove_quotes, Bool_t escape_special)
{
if (!value || !*value)
return "";
Expand Down Expand Up @@ -1350,6 +1350,9 @@ TString TRootSniffer::DecodeUrlOptionValue(const char *value, Bool_t remove_quot
res.Remove(0, 1);
}

if (!escape_special && remove_quotes)
return res;

// we expect normal content here, no special symbols, no unescaped quotes
TString clean;
for (Ssiz_t i = 0; i < res.Length(); ++i) {
Expand Down
5 changes: 5 additions & 0 deletions net/httpsniff/inc/TRootSnifferFull.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,18 @@

#include "TRootSniffer.h"
#include <string>
#include <memory>
#include <map>

class TMemFile;
class TMethodCall;
class TMethod;

class TRootSnifferFull : public TRootSniffer {
protected:
TMemFile *fMemFile{nullptr}; ///<! file used to manage streamer infos
TList *fSinfo{nullptr}; ///<! last produced streamer info
std::map<const TMethod *, std::unique_ptr<TMethodCall>> fExeCache; ///<! cache for exe.json invocation

void ScanObjectProperties(TRootSnifferScanRec &rec, TObject *obj) override;

Expand Down
158 changes: 125 additions & 33 deletions net/httpsniff/src/TRootSnifferFull.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,29 @@ Bool_t TRootSnifferFull::ProduceXml(const std::string &path, const std::string &
return !res.empty();
}

class TArgHolderBase : public TObject {
public:
TArgHolderBase() : TObject() {}
virtual const void *GetPtr() const { return nullptr; }
};

template<typename T>
class TArgHolder : public TArgHolderBase {
public:
T fValue;
TArgHolder(T v) : fValue(v) {}
const void *GetPtr() const override { return &fValue; }
};

class TArgHolderConstChar : public TArgHolderBase {
public:
TString fValue;
const char *fBuf = nullptr;
TArgHolderConstChar(const char *v) : fValue(v) { fBuf = fValue.Data(); }
const void *GetPtr() const override { return &fBuf; }
};


////////////////////////////////////////////////////////////////////////////////
/// Execute command for specified object
///
Expand Down Expand Up @@ -613,9 +636,18 @@ Bool_t TRootSnifferFull::ProduceExe(const std::string &path, const std::string &
garbage.SetOwner(kTRUE); // use as garbage collection
TObject *post_obj = nullptr; // object reconstructed from post request
TString call_args;
std::vector<const void *> plain_args;
Bool_t can_use_plain = kTRUE, add_plain = kFALSE;

auto add_plain_arg = [&plain_args, &garbage, &add_plain](TArgHolderBase *arg) {
plain_args.emplace_back(arg->GetPtr());
garbage.Add(arg);
add_plain = kTRUE;
};

TIter next(args);
while (auto arg = static_cast<TMethodArg *>(next())) {
add_plain = kFALSE;

if ((strcmp(arg->GetName(), "rest_url_opt") == 0) && (strcmp(arg->GetFullTypeName(), "const char*") == 0) &&
(args->GetSize() == 1)) {
Expand All @@ -629,6 +661,7 @@ Bool_t TRootSnifferFull::ProduceExe(const std::string &path, const std::string &
call_args.Append("\"");
call_args.Append(DecodeUrlOptionValue(rest_url, kTRUE));
call_args.Append("\"");
add_plain_arg(new TArgHolderConstChar(rest_url));
break;
}

Expand All @@ -642,6 +675,7 @@ Bool_t TRootSnifferFull::ProduceExe(const std::string &path, const std::string &
if (sval == "_this_") {
// special case - object itself is used as argument
sval.Form("(%s*)0x%zx", obj_cl->GetName(), (size_t)obj_ptr);
add_plain_arg(new TArgHolder<void*>(obj_ptr));
} else if ((fCurrentArg != nullptr) && (fCurrentArg->GetPostData() != nullptr)) {
// process several arguments which are specific for post requests
if (fAllowPostObject && (sval == "_post_object_xml_")) {
Expand All @@ -654,6 +688,7 @@ Bool_t TRootSnifferFull::ProduceExe(const std::string &path, const std::string &
if (url.HasOption("_destroy_post_"))
garbage.Add(post_obj);
}
add_plain_arg(new TArgHolder<void*>(post_obj));
} else if (fAllowPostObject && (sval == "_post_object_json_")) {
// post data has extra 0 at the end and can be used as null-terminated string
post_obj = TBufferJSON::ConvertFromJSON((const char *)fCurrentArg->GetPostData());
Expand All @@ -664,6 +699,7 @@ Bool_t TRootSnifferFull::ProduceExe(const std::string &path, const std::string &
if (url.HasOption("_destroy_post_"))
garbage.Add(post_obj);
}
add_plain_arg(new TArgHolder<void*>(post_obj));
} else if (fAllowPostObject && (sval == "_post_object_") && url.HasOption("_post_class_")) {
TString clname = DecodeUrlOptionValue(url.GetValueFromOptions("_post_class_"), kTRUE);
TClass *arg_cl = gROOT->GetClass(clname, kTRUE, kTRUE);
Expand All @@ -686,9 +722,11 @@ Bool_t TRootSnifferFull::ProduceExe(const std::string &path, const std::string &
sval = "0";
else
sval.Form("(%s*)0x%zx", clname.Data(), (size_t)post_obj);
} else if (sval == "_post_data_")
add_plain_arg(new TArgHolder<void*>(post_obj));
} else if (sval == "_post_data_") {
sval.Form("(void*)0x%zx", (size_t)fCurrentArg->GetPostData());
else if (sval == "_post_length_")
add_plain_arg(new TArgHolder<const void*>(fCurrentArg->GetPostData()));
} else if (sval == "_post_length_")
sval.Form("%ld", (long)fCurrentArg->GetPostDataLength());
else
sanitize_numeric = kTRUE;
Expand All @@ -706,6 +744,39 @@ Bool_t TRootSnifferFull::ProduceExe(const std::string &path, const std::string &
if (call_args.Length() > 0)
call_args += ", ";

if (!add_plain) {
std::string tname = arg->GetTypeNormalizedName();
if (tname == "const char*")
// one can use original string, just remove optional quotes
add_plain_arg(new TArgHolderConstChar(DecodeUrlOptionValue(val, kTRUE, kFALSE)));
else if (tname == "bool")
add_plain_arg(new TArgHolder<bool>(!sval.IsNull() && (sval != "0") && (sval != "false")));
else if (tname == "double")
add_plain_arg(new TArgHolder<double>(std::stod(sval.Data())));
else if (tname == "float")
add_plain_arg(new TArgHolder<float>(std::stof(sval.Data())));
else if (tname == "int")
add_plain_arg(new TArgHolder<int>(std::stol(sval.Data())));
else if (tname == "long")
add_plain_arg(new TArgHolder<long>(std::stol(sval.Data())));
else if (tname == "short")
add_plain_arg(new TArgHolder<short>(std::stol(sval.Data())));
else if (tname == "char")
add_plain_arg(new TArgHolder<char>(std::stol(sval.Data())));
else if (tname == "unsigned int")
add_plain_arg(new TArgHolder<unsigned int>(std::stoul(sval.Data())));
else if (tname == "unisgned long")
add_plain_arg(new TArgHolder<unsigned long>(std::stoul(sval.Data())));
else if (tname == "unsigned short")
add_plain_arg(new TArgHolder<unsigned short>(std::stoul(sval.Data())));
else if (tname == "unsigned char")
add_plain_arg(new TArgHolder<unsigned char>(std::stoul(sval.Data())));
else if (!tname.empty() && tname.back() == '*' && (sval == "0" || sval == "null" || sval == "nullptr"))
add_plain_arg(new TArgHolder<Longptr_t>(0));
else
can_use_plain = kFALSE; // unsupported type, plain args cannot be used
}

Bool_t isstr = (strcmp(arg->GetFullTypeName(), "const char*") == 0) ||
(strcmp(arg->GetFullTypeName(), "Option_t*") == 0) ||
(strcmp(arg->GetFullTypeName(), "string") == 0);
Expand Down Expand Up @@ -742,17 +813,31 @@ Bool_t TRootSnifferFull::ProduceExe(const std::string &path, const std::string &
TMethodCall *call = nullptr;

if (method != nullptr) {
call = new TMethodCall(obj_cl, method_name, call_args.Data());
if (can_use_plain) {
// prevent creation of huge cache
if (fExeCache.size() > 1000)
fExeCache.clear();
auto iter = fExeCache.find(method);
if (iter != fExeCache.end()) {
call = iter->second.get();
} else {
call = new TMethodCall();
call->InitWithPrototype(obj_cl, method_name, prototype.IsNull() ? nullptr : prototype.Data());
fExeCache.emplace(method, std::unique_ptr<TMethodCall>(call));
}
} else {
call = new TMethodCall(obj_cl, method_name, call_args.Data());
garbage.Add(call);
}
if (debug)
debug->append(TString::Format("Calling obj->%s(%s);\n", method_name, call_args.Data()).Data());
} else {
call = new TMethodCall(funcname.Data(), call_args.Data());
garbage.Add(call);
if (debug)
debug->append(TString::Format("Calling %s(%s);\n", funcname.Data(), call_args.Data()).Data());
}

garbage.Add(call);

if (!call->IsValid()) {
if (debug)
debug->append("Fail: invalid TMethodCall\n");
Expand All @@ -772,10 +857,23 @@ Bool_t TRootSnifferFull::ProduceExe(const std::string &path, const std::string &
garbage.Add(resbuf);
}

switch (call->ReturnType()) {
auto ret_type = call->ReturnType();
if (ret_type == TMethodCall::kOther) {
std::string ret_kind = func ? func->GetReturnTypeNormalizedName() : method->GetReturnTypeNormalizedName();
if ((ret_kind.length() > 0) && (ret_kind[ret_kind.length() - 1] == '*')) {
ret_kind.resize(ret_kind.length() - 1);
ret_cl = gROOT->GetClass(ret_kind.c_str(), kTRUE, kTRUE);
}
if (!ret_cl)
ret_type = TMethodCall::kNone;
}

switch (ret_type) {
case TMethodCall::kLong: {
Longptr_t l(0);
if (method)
Longptr_t l = 0;
if (method && can_use_plain)
call->Execute(obj_ptr, plain_args.data(), plain_args.size(), &l);
else if (method)
call->Execute(obj_ptr, l);
else
call->Execute(l);
Expand All @@ -786,8 +884,10 @@ Bool_t TRootSnifferFull::ProduceExe(const std::string &path, const std::string &
break;
}
case TMethodCall::kDouble: {
Double_t d(0.);
if (method)
Double_t d = 0.;
if (method && can_use_plain)
call->Execute(obj_ptr, plain_args.data(), plain_args.size(), &d);
else if (method)
call->Execute(obj_ptr, d);
else
call->Execute(d);
Expand All @@ -799,7 +899,9 @@ Bool_t TRootSnifferFull::ProduceExe(const std::string &path, const std::string &
}
case TMethodCall::kString: {
char *txt = nullptr;
if (method)
if (method && can_use_plain)
call->Execute(obj_ptr, plain_args.data(), plain_args.size(), &txt);
else if (method)
call->Execute(obj_ptr, &txt);
else
call->Execute(&txt);
Expand All @@ -812,31 +914,21 @@ Bool_t TRootSnifferFull::ProduceExe(const std::string &path, const std::string &
break;
}
case TMethodCall::kOther: {
std::string ret_kind = func ? func->GetReturnTypeNormalizedName() : method->GetReturnTypeNormalizedName();
if ((ret_kind.length() > 0) && (ret_kind[ret_kind.length() - 1] == '*')) {
ret_kind.resize(ret_kind.length() - 1);
ret_cl = gROOT->GetClass(ret_kind.c_str(), kTRUE, kTRUE);
}

if (ret_cl != nullptr) {
Longptr_t l(0);
if (method)
call->Execute(obj_ptr, l);
else
call->Execute(l);
if (l != 0)
ret_obj = (void *)l;
} else {
if (method)
call->Execute(obj_ptr);
else
call->Execute();
}

Longptr_t l = 0;
if (method && can_use_plain)
call->Execute(obj_ptr, plain_args.data(), plain_args.size(), &l);
else if (method)
call->Execute(obj_ptr, l);
else
call->Execute(l);
if (l != 0)
ret_obj = (void *)l;
break;
}
case TMethodCall::kNone: {
if (method)
if (method && can_use_plain)
call->Execute(obj_ptr, plain_args.data(), plain_args.size());
else if (method)
call->Execute(obj_ptr);
else
call->Execute();
Expand Down
28 changes: 25 additions & 3 deletions net/httpsniff/test/test_sniffer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ TEST(TRootSniffer, set_title)
std::string res;

sniffer.Produce("/obj", "exe.json", "method=SetTitle&title=NewTitle", res);
EXPECT_EQ(res, "null") << "return value of exe.json when methout return void";
EXPECT_EQ(res, "null") << "return value of exe.json when method return void";
EXPECT_EQ(std::string("NewTitle"), obj.GetTitle()) << "compare object title with applied value";

res = "";
Expand All @@ -244,9 +244,31 @@ TEST(TRootSniffer, set_title)
EXPECT_EQ(std::string("UrlStyleQuotedTitle"), obj.GetTitle()) << "compare object title with applied value";

res = "";
sniffer.Produce("/obj", "exe.json", "method=SetTitle&title=Mail\"Formed\"Title", res);
sniffer.Produce("/obj", "exe.json", "method=SetTitle&title=Mal\"formed\"title", res);
EXPECT_EQ(res, "null");
EXPECT_EQ(std::string("Mail\"Formed\"Title"), obj.GetTitle()) << "compare object title with applied value";
EXPECT_EQ(std::string("Mal\"formed\"title"), obj.GetTitle()) << "compare object title with applied value";
}

// changing object title many times
TEST(TRootSniffer, many_set_title)
{
TNamed obj("obj", "title");

TRootSnifferFull sniffer("sniffer");
// disable readonly to get method executed
sniffer.SetReadOnly(kFALSE);

sniffer.RegisterObject("/", &obj);

std::string res;

for (int n = 0; n < 1000; ++n) {
std::string new_title = "NewTitle" + std::to_string(n);

sniffer.Produce("/obj", "exe.json", "method=SetTitle&title=" + new_title, res);
EXPECT_EQ(res, "null") << "return value of exe.json when method return void";
EXPECT_EQ(new_title, obj.GetTitle()) << "compare object title with applied value";
}
}

// testing command execution with different signatures
Expand Down
Loading