Skip to content

Use JMX support classes only when JMX is enabled to avoid unnecessary… #822

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
merged 2 commits into from
Jan 30, 2024
Merged

Use JMX support classes only when JMX is enabled to avoid unnecessary… #822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a0a35a
Use JMX support classes only when JMX is enabled to avoid unnecessary…
iroqueta Jan 19, 2024
82fdede
Merge branch 'master' into JMXPerformance
iroqueta Jan 30, 2024
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
14 changes: 9 additions & 5 deletions java/src/main/java/com/genexus/GXProcedure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,11 @@ public GXProcedure(int remoteHandle, ModelContext context, String location) {

public GXProcedure(boolean inNewUTL, int remoteHandle, ModelContext context, String location) {
//JMX Counter
beginExecute = new Date();
ProcedureInfo pInfo = ProceduresInfo.addProcedureInfo(this.getClass().getName());
pInfo.incCount();
if (Application.isJMXEnabled()) {
beginExecute = new Date();
ProcedureInfo pInfo = ProceduresInfo.addProcedureInfo(this.getClass().getName());
pInfo.incCount();
}

this.remoteHandle = remoteHandle;
this.context = context;
Expand Down Expand Up @@ -148,8 +150,10 @@ private void exitApplication(boolean flushBuffers) {
}

public void endExecute(String name) {
ProcedureInfo pInfo = ProceduresInfo.getProcedureInfo(name);
pInfo.setTimeExecute(System.currentTimeMillis() - beginExecute.getTime());
if (Application.isJMXEnabled()) {
ProcedureInfo pInfo = ProceduresInfo.getProcedureInfo(name);
pInfo.setTimeExecute(System.currentTimeMillis() - beginExecute.getTime());
}

if (context != null && context.getSessionContext() != null) {
ApplicationContext.getInstance().setEJB(false);
Expand Down
31 changes: 15 additions & 16 deletions java/src/main/java/com/genexus/db/DataStoreProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,17 @@ public DataStoreProvider(ModelContext context, int remoteHandle, ILocalDataStore
super(context, remoteHandle);

//JMX Enabled
if (Application.isJMXEnabled())
if (firstTime.get())
{
if (Application.isJMXEnabled()) {
if (firstTime.get()) {
DataStoreProvidersJMX.CreateDataStoreProvidersJMX();
firstTime.set(false);
}
addDataStoreProviderInfo(helper.getClass().getName());
}

this.helper = helper;
this.cursors = helper.getCursors();
setOutputBuffers(buffers);

//JMX
addDataStoreProviderInfo(helper.getClass().getName());

}

public void setErrorBuffers(int cursorIdx, Object[] buffers)
Expand Down Expand Up @@ -716,18 +713,20 @@ void beginExecute()

void incSentencesCount(String key, Cursor cursor)
{

DataStoreProviderInfo dsInfo = getDataStoreProviderInfo(key);
dsInfo.incSentenceCount();
SentenceInfo sInfo;
if (cursor.dynStatement) {
sInfo = dsInfo.addSentenceInfo(key + "_" + cursor.mCursorId, key
DataStoreProviderInfo dsInfo = null;
if (Application.isJMXEnabled()) {
dsInfo = getDataStoreProviderInfo(key);
dsInfo.incSentenceCount();
SentenceInfo sInfo;
if (cursor.dynStatement) {
sInfo = dsInfo.addSentenceInfo(key + "_" + cursor.mCursorId, key
+ "_" + cursor.mCursorId + "_" + cursor.mSQLSentence);
} else {
sInfo = dsInfo.addSentenceInfo(key + "_" + cursor.mCursorId,
} else {
sInfo = dsInfo.addSentenceInfo(key + "_" + cursor.mCursorId,
cursor.mSQLSentence);
}
sInfo.incSentenceCount();
}
sInfo.incSentenceCount();

String sqlSnt = cursor.mSQLSentence;
sentenceCount.incrementAndGet();
Expand Down
8 changes: 2 additions & 6 deletions java/src/main/java/com/genexus/performance/ProceduresInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,13 @@

import java.io.PrintStream;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.concurrent.ConcurrentHashMap;

import com.genexus.Application;

public class ProceduresInfo
{
static private Hashtable<String, ProcedureInfo> procedureInfo = new Hashtable<>();

public ProceduresInfo()
{
}
static private ConcurrentHashMap<String, ProcedureInfo> procedureInfo = new ConcurrentHashMap<>();

static public void dump(PrintStream out)
{
Expand Down