Skip to content

P
proview
Commit 0d5bcba0 authored by Claes Sjofors's avatar Claes Sjofors
Browse files
Options

js alarm and eventlist added

parent f2be704e
Hide whitespace changes
Inline Side-by-side
Showing with 33690 additions and 27847 deletions
java/exe/jpwr_rt_gdh/src/jpwr_rt_gdh.c
View file @ 0d5bcba0
......@@ -1784,6 +1784,9 @@ static void gdh_TranslateSuffixToClassData (
*PwrType = pwr_eType_Float32;
*PwrSize = 4;
if (!str_NoCaseStrncmp("BIT", SuffixPtr, 3))
*(SuffixPtr + 3) = 0;
for (Index = 0, Found = FALSE; Index < XlationTblLen; Index++)
if (!str_NoCaseStrcmp(XlationTbl[Index].TypeStr,SuffixPtr))
{
......@@ -1799,6 +1802,7 @@ static void gdh_TranslateSuffixToClassData (
*PwrType = pwr_eType_String;
}
if ( Ptr != NULL && *NoOfElements > 1)
{
*PwrSize *= *NoOfElements;
......
java/exe/jpwr_rt_gdh/src/jpwr_rt_mh.c
View file @ 0d5bcba0
......@@ -53,8 +53,11 @@
pwr_tStatus ev_mh_ack_bc( mh_sAck *MsgP);
pwr_tStatus ev_mh_return_bc( mh_sReturn *MsgP);
pwr_tStatus ev_mh_alarm_bc( mh_sMessage *MsgP);
pwr_tStatus ev_mh_block_bc( mh_sBlock *MsgP);
pwr_tStatus ev_mh_cancel_bc( mh_sReturn *MsgP);
pwr_tStatus ev_mh_info_bc( mh_sMessage *MsgP);
pwr_tStatus ev_mh_clear_alarmlist_bc( pwr_tNodeIndex nix);
pwr_tStatus ev_mh_clear_blocklist_bc( pwr_tNodeIndex nix);
jclass Mh_id;
jmethodID Mh_messReceived_id;
......@@ -73,7 +76,7 @@ JNIEXPORT void JNICALL Java_jpwr_rt_Mh_initIDs
}
//hmta pekare till staticmetoden messReceived
Mh_messReceived_id = (*env)->GetStaticMethodID( env, Mh_id, "messReceived",
"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IIIILjava/lang/String;IILjava/lang/String;IILjpwr/rt/PwrtObjid;)V");
"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IIIILjava/lang/String;IILjava/lang/String;IILjpwr/rt/PwrtAttrRef;Ljpwr/rt/PwrtAttrRef;Ljava/lang/String;)V");
sts = (*env)->GetJavaVM(env, &jvm);
if(sts)
{
......@@ -226,10 +229,10 @@ JNIEXPORT jobject JNICALL Java_jpwr_rt_Mh_outunitConnect
mh_mOutunitFlags_ReadWait,
ev_mh_ack_bc,
ev_mh_alarm_bc,
NULL,
NULL,
ev_mh_block_bc,
ev_mh_return_bc,
ev_mh_clear_alarmlist_bc,
NULL,
ev_mh_clear_blocklist_bc,
ev_mh_info_bc,
ev_mh_return_bc,
NULL
......@@ -309,35 +312,40 @@ JNIEXPORT jobject JNICALL Java_jpwr_rt_Mh_outunitReceive
}
/*frn xtt_ev.cpp*/
pwr_tStatus ev_mh_ack_bc( mh_sAck *MsgP)
{
JNIEnv *env;
jclass PwrtObjid_id;
jmethodID PwrtObjid_cid;
jobject objid_obj = NULL;
jobject objid_obj = NULL;
jobject supobjid_obj = NULL;
jclass PwrtAttrRef_id;
jmethodID PwrtAttrRef_cid;
jobject attrref_obj = NULL;
jobject supattrref_obj = NULL;
jstring jevText;
jstring jevName;
jstring jevTime;
jstring jevBirthTime;
jstring jevMoreText;
jint jevFlags;
jint jevPrio;
jint jevStatus;
jint jevNix;
jint jevIdx;
jstring jevTargetBirthTime;
jint jevTargetNix;
jint jevTargetIdx;
char targetBirthTime_str[40];
jint jevType;
jint oix, vid;
jint body, offset, size, flags;
jstring jevTargetBirthTime;
jint jevTargetNix = (jint) 0;
jint jevTargetIdx = (jint) 0;
char time_str[40];
char birthTime_str[40];
pwr_tObjid objid = MsgP->SupObject.Objid;
char targetBirthTime_str[40];
pwr_tTime time = net_NetTimeToTime( &MsgP->Info.EventTime);
pwr_tTime birthTime = net_NetTimeToTime( &MsgP->Info.Id.BirthTime);
......@@ -347,50 +355,70 @@ pwr_tStatus ev_mh_ack_bc( mh_sAck *MsgP)
(*jvm)->AttachCurrentThread(jvm,(void **)&env,NULL);
if(env == NULL) printf("env r null");
PwrtObjid_id = (*env)->FindClass( env, "jpwr/rt/PwrtObjid");
PwrtObjid_cid = (*env)->GetMethodID( env, PwrtObjid_id,
"<init>", "(II)V");
oix = (jint) objid.oix;
vid = (jint) objid.vid;
PwrtAttrRef_id = (*env)->FindClass( env, "jpwr/rt/PwrtAttrRef");
PwrtAttrRef_cid = (*env)->GetMethodID( env, PwrtAttrRef_id,
"<init>", "(Ljpwr/rt/PwrtObjid;IIII)V");
oix = (jint) MsgP->Object.Objid.oix;
vid = (jint) MsgP->Object.Objid.vid;
objid_obj = (*env)->NewObject( env, PwrtObjid_id, PwrtObjid_cid,
oix, vid);
body = (jint) MsgP->Object.Body;
offset = (jint) MsgP->Object.Offset;
size = (jint) MsgP->Object.Size;
flags = (jint) MsgP->Object.Flags.m;
attrref_obj = (*env)->NewObject( env, PwrtAttrRef_id, PwrtAttrRef_cid,
objid_obj, body, offset, size, flags);
oix = (jint) MsgP->SupObject.Objid.oix;
vid = (jint) MsgP->SupObject.Objid.vid;
supobjid_obj = (*env)->NewObject( env, PwrtObjid_id, PwrtObjid_cid,
oix, vid);
body = (jint) MsgP->SupObject.Body;
offset = (jint) MsgP->SupObject.Offset;
size = (jint) MsgP->SupObject.Size;
flags = (jint) MsgP->SupObject.Flags.m;
supattrref_obj = (*env)->NewObject( env, PwrtAttrRef_id, PwrtAttrRef_cid,
supobjid_obj, body, offset, size, flags);
time_AtoAscii( &time, time_eFormat_ComprDateAndTime, time_str, sizeof(time_str));
time_AtoAscii( &birthTime, time_eFormat_ComprDateAndTime, birthTime_str, sizeof(birthTime_str));
time_AtoAscii( &targetBirthTime, time_eFormat_ComprDateAndTime, targetBirthTime_str, sizeof(targetBirthTime_str));
//gr om till Java-strngar
jevText = (*env)->NewStringUTF( env, " "); //eventText anvnds inte vid ack
// Convert to java strings
jevText = (*env)->NewStringUTF( env, ""); // Not used in ack
jevName = (*env)->NewStringUTF( env, MsgP->EventName);
jevTime = (*env)->NewStringUTF( env, time_str);
jevBirthTime = (*env)->NewStringUTF( env, birthTime_str);
jevTargetBirthTime = (*env)->NewStringUTF( env, targetBirthTime_str);
//gr om till Java-int
jevMoreText = (*env)->NewStringUTF( env, ""); // Not used in ack
// Convert to java int
jevFlags = (jint)MsgP->Info.EventFlags;
jevPrio = (jint)MsgP->Info.EventPrio;
jevStatus = (jint)1; //finns ej i mh_sAck och anvnds ej heller
jevStatus = (jint)1; // Not used in ack
jevNix = (jint)MsgP->Info.Id.Nix;
jevIdx = (jint)MsgP->Info.Id.Idx;
jevType = (jint)MsgP->Info.EventType;
jevTargetNix = (jint)MsgP->TargetId.Nix;
jevTargetIdx = (jint)MsgP->TargetId.Idx;
jevType = (jint)MsgP->Info.EventType;
//anropa callback metoden i Mh-klassen
// Call the callback method in the Mh class
(*env)->CallStaticVoidMethod( env, Mh_id, Mh_messReceived_id, jevText, jevName,
jevTime, jevFlags, jevPrio, jevStatus, jevNix, jevBirthTime, jevIdx,
jevTargetNix, jevTargetBirthTime, jevTargetIdx,
jevType, objid_obj);
//important:check if an exception was raised
if ((*env)->ExceptionCheck(env))
{
printf("exception i ack\n");
jevType, attrref_obj, supattrref_obj, jevMoreText);
// Important, check if an exception was raised
if ((*env)->ExceptionCheck(env)) {
printf("Exception in ack_bc\n");
return 1;
}
......@@ -402,11 +430,17 @@ pwr_tStatus ev_mh_return_bc( mh_sReturn *MsgP)
JNIEnv *env;
jclass PwrtObjid_id;
jmethodID PwrtObjid_cid;
jobject objid_obj = NULL;
jobject objid_obj = NULL;
jobject supobjid_obj = NULL;
jclass PwrtAttrRef_id;
jmethodID PwrtAttrRef_cid;
jobject attrref_obj = NULL;
jobject supattrref_obj = NULL;
jstring jevText;
jstring jevName;
jstring jevTime;
jstring jevBirthTime;
jstring jevMoreText;
jint jevFlags;
jint jevPrio;
jint jevStatus;
......@@ -414,18 +448,18 @@ pwr_tStatus ev_mh_return_bc( mh_sReturn *MsgP)
jint jevIdx;
jint jevType;
jint oix, vid;
jint body, offset, size, flags;
jstring jevTargetBirthTime;
jint jevTargetNix;
jint jevTargetIdx;
char targetBirthTime_str[40];
char time_str[40];
char birthTime_str[40];
char targetBirthTime_str[40];
pwr_tObjid objid = MsgP->Object.Objid;
pwr_tTime time = net_NetTimeToTime( &MsgP->Info.EventTime);
pwr_tTime birthTime = net_NetTimeToTime( &MsgP->Info.Id.BirthTime);
pwr_tTime targetBirthTime = net_NetTimeToTime( &MsgP->TargetId.BirthTime);
......@@ -438,45 +472,65 @@ pwr_tStatus ev_mh_return_bc( mh_sReturn *MsgP)
PwrtObjid_cid = (*env)->GetMethodID( env, PwrtObjid_id,
"<init>", "(II)V");
oix = (jint) objid.oix;
vid = (jint) objid.vid;
PwrtAttrRef_id = (*env)->FindClass( env, "jpwr/rt/PwrtAttrRef");
PwrtAttrRef_cid = (*env)->GetMethodID( env, PwrtAttrRef_id,
"<init>", "(Ljpwr/rt/PwrtObjid;IIII)V");
oix = (jint) MsgP->Object.Objid.oix;
vid = (jint) MsgP->Object.Objid.vid;
objid_obj = (*env)->NewObject( env, PwrtObjid_id, PwrtObjid_cid,
oix, vid);
body = (jint) MsgP->Object.Body;
offset = (jint) MsgP->Object.Offset;
size = (jint) MsgP->Object.Size;
flags = (jint) MsgP->Object.Flags.m;
attrref_obj = (*env)->NewObject( env, PwrtAttrRef_id, PwrtAttrRef_cid,
objid_obj, body, offset, size, flags);
oix = (jint) MsgP->SupObject.Objid.oix;
vid = (jint) MsgP->SupObject.Objid.vid;
supobjid_obj = (*env)->NewObject( env, PwrtObjid_id, PwrtObjid_cid,
oix, vid);
body = (jint) MsgP->SupObject.Body;
offset = (jint) MsgP->SupObject.Offset;
size = (jint) MsgP->SupObject.Size;
flags = (jint) MsgP->SupObject.Flags.m;
supattrref_obj = (*env)->NewObject( env, PwrtAttrRef_id, PwrtAttrRef_cid,
supobjid_obj, body, offset, size, flags);
time_AtoAscii( &time, time_eFormat_ComprDateAndTime, time_str, sizeof(time_str));
time_AtoAscii( &birthTime, time_eFormat_ComprDateAndTime, birthTime_str, sizeof(birthTime_str));
time_AtoAscii( &targetBirthTime, time_eFormat_ComprDateAndTime, targetBirthTime_str, sizeof(targetBirthTime_str));
//gr om till Java-strngar
// Convert to java strings
jevText = (*env)->NewStringUTF( env, MsgP->EventText);
jevName = (*env)->NewStringUTF( env, MsgP->EventName);
jevTime = (*env)->NewStringUTF( env, time_str);
jevBirthTime = (*env)->NewStringUTF( env, birthTime_str);
jevTargetBirthTime = (*env)->NewStringUTF( env, targetBirthTime_str);
jevMoreText = (*env)->NewStringUTF( env, "");
//gr om till Java-int
// Convert to java int
jevFlags = (jint)MsgP->Info.EventFlags;
jevPrio = (jint)MsgP->Info.EventPrio;
jevStatus = (jint)1;//mh_sReturn har ingen status
jevStatus = (jint)1; // Not used in return
jevNix = (jint)MsgP->Info.Id.Nix;
jevIdx = (jint)MsgP->Info.Id.Idx;
jevType = (jint)MsgP->Info.EventType;
jevTargetNix = (jint)MsgP->TargetId.Nix;
jevTargetIdx = (jint)MsgP->TargetId.Idx;
jevType = (jint)MsgP->Info.EventType;
//anropa callback metoden i Mh-klassen
// Call the callback method in the Mh class
(*env)->CallStaticVoidMethod( env, Mh_id, Mh_messReceived_id, jevText, jevName,
jevTime, jevFlags, jevPrio, jevStatus, jevNix, jevBirthTime, jevIdx,
jevTargetNix, jevTargetBirthTime, jevTargetIdx,
jevType, objid_obj);
//important:check if an exception was raised
if ((*env)->ExceptionCheck(env))
{
printf("exception i return\n");
jevType, attrref_obj, supattrref_obj, jevMoreText);
// Important, check if an exception was raised
if ((*env)->ExceptionCheck(env)) {
printf("Exception in return_bc\n");
return 1;
}
......@@ -488,11 +542,17 @@ pwr_tStatus ev_mh_alarm_bc( mh_sMessage *MsgP)
JNIEnv *env;
jclass PwrtObjid_id;
jmethodID PwrtObjid_cid;
jobject objid_obj = NULL;
jobject objid_obj = NULL;
jobject supobjid_obj = NULL;
jclass PwrtAttrRef_id;
jmethodID PwrtAttrRef_cid;
jobject attrref_obj = NULL;
jobject supattrref_obj = NULL;
jstring jevText;
jstring jevName;
jstring jevTime;
jstring jevBirthTime;
jstring jevMoreText;
jint jevFlags;
jint jevPrio;
jint jevStatus;
......@@ -500,17 +560,17 @@ pwr_tStatus ev_mh_alarm_bc( mh_sMessage *MsgP)
jint jevIdx;
jint jevType;
jint oix, vid;
jint body, offset, size, flags;
jstring jevTargetBirthTime;
jint jevTargetNix = (jint) 0;
jint jevTargetIdx = (jint) 0;
jint jevTargetNix;
jint jevTargetIdx;
char time_str[40];
char birthTime_str[40];
pwr_tObjid objid = MsgP->Object.Objid;
pwr_tTime time = net_NetTimeToTime( &MsgP->Info.EventTime);
pwr_tTime birthTime = net_NetTimeToTime( &MsgP->Info.Id.BirthTime);
......@@ -522,40 +582,175 @@ pwr_tStatus ev_mh_alarm_bc( mh_sMessage *MsgP)
PwrtObjid_cid = (*env)->GetMethodID( env, PwrtObjid_id,
"<init>", "(II)V");
oix = (jint) objid.oix;
vid = (jint) objid.vid;
PwrtAttrRef_id = (*env)->FindClass( env, "jpwr/rt/PwrtAttrRef");
PwrtAttrRef_cid = (*env)->GetMethodID( env, PwrtAttrRef_id,
"<init>", "(Ljpwr/rt/PwrtObjid;IIII)V");
oix = (jint) MsgP->Object.Objid.oix;
vid = (jint) MsgP->Object.Objid.vid;
objid_obj = (*env)->NewObject( env, PwrtObjid_id, PwrtObjid_cid,
oix, vid);
body = (jint) MsgP->Object.Body;
offset = (jint) MsgP->Object.Offset;
size = (jint) MsgP->Object.Size;
flags = (jint) MsgP->Object.Flags.m;
attrref_obj = (*env)->NewObject( env, PwrtAttrRef_id, PwrtAttrRef_cid,
objid_obj, body, offset, size, flags);
oix = (jint) MsgP->SupObject.Objid.oix;
vid = (jint) MsgP->SupObject.Objid.vid;
supobjid_obj = (*env)->NewObject( env, PwrtObjid_id, PwrtObjid_cid,
oix, vid);
body = (jint) MsgP->SupObject.Body;
offset = (jint) MsgP->SupObject.Offset;
size = (jint) MsgP->SupObject.Size;
flags = (jint) MsgP->SupObject.Flags.m;
supattrref_obj = (*env)->NewObject( env, PwrtAttrRef_id, PwrtAttrRef_cid,
supobjid_obj, body, offset, size, flags);
time_AtoAscii( &time, time_eFormat_ComprDateAndTime, time_str, sizeof(time_str));
time_AtoAscii( &birthTime, time_eFormat_ComprDateAndTime, birthTime_str, sizeof(birthTime_str));
//gr om till Java-strngar
// Convert to java strings
jevText = (*env)->NewStringUTF( env, MsgP->EventText);
jevName = (*env)->NewStringUTF( env, MsgP->EventName);
jevTime = (*env)->NewStringUTF( env, time_str);
jevBirthTime = (*env)->NewStringUTF( env, birthTime_str);
jevTargetBirthTime = (*env)->NewStringUTF( env, "");
jevMoreText = (*env)->NewStringUTF( env, MsgP->EventMoreText);
jevTargetBirthTime = (*env)->NewStringUTF( env, " ");
// Convert to java int
jevFlags = (jint)MsgP->Info.EventFlags;
jevPrio = (jint)MsgP->Info.EventPrio;
jevStatus = (jint)MsgP->Status;
jevNix = (jint)MsgP->Info.Id.Nix;
jevIdx = (jint)MsgP->Info.Id.Idx;
jevType = (jint)MsgP->Info.EventType;
jevTargetNix = (jint)0;
jevTargetIdx = (jint)0;
// Call the callback method in the Mh class
(*env)->CallStaticVoidMethod( env, Mh_id, Mh_messReceived_id, jevText, jevName,
jevTime, jevFlags, jevPrio, jevStatus, jevNix, jevBirthTime, jevIdx,
jevTargetNix, jevTargetBirthTime, jevTargetIdx,
jevType, attrref_obj, supattrref_obj, jevMoreText);
// Important, check if an exception was raised
if ((*env)->ExceptionCheck(env)) {
printf("Exception in alarm_bc\n");
return 1;
}
//gr om till Java-int
return 1;
}
pwr_tStatus ev_mh_block_bc( mh_sBlock *MsgP)
{
JNIEnv *env;
jclass PwrtObjid_id;
jmethodID PwrtObjid_cid;
jobject objid_obj = NULL;
jobject supobjid_obj = NULL;
jclass PwrtAttrRef_id;
jmethodID PwrtAttrRef_cid;
jobject attrref_obj = NULL;
jobject supattrref_obj = NULL;
jstring jevText;
jstring jevName;
jstring jevTime;
jstring jevBirthTime;
jstring jevMoreText;
jint jevFlags;
jint jevPrio;
jint jevStatus;
jint jevNix;
jint jevIdx;
jint jevType;
jint oix, vid;
jint body, offset, size, flags;
jstring jevTargetBirthTime;
jint jevTargetNix;
jint jevTargetIdx;
char time_str[40];
char birthTime_str[40];
pwr_tTime time = net_NetTimeToTime( &MsgP->Info.EventTime);
pwr_tTime birthTime = net_NetTimeToTime( &MsgP->Info.Id.BirthTime);
//hmta enviormentpekaren
(*jvm)->AttachCurrentThread(jvm,(void **)&env,NULL);
if(env == NULL) printf("env r null");
PwrtObjid_id = (*env)->FindClass( env, "jpwr/rt/PwrtObjid");
PwrtObjid_cid = (*env)->GetMethodID( env, PwrtObjid_id,
"<init>", "(II)V");
PwrtAttrRef_id = (*env)->FindClass( env, "jpwr/rt/PwrtAttrRef");
PwrtAttrRef_cid = (*env)->GetMethodID( env, PwrtAttrRef_id,
"<init>", "(Ljpwr/rt/PwrtObjid;IIII)V");
oix = (jint) MsgP->Object.Objid.oix;
vid = (jint) MsgP->Object.Objid.vid;
objid_obj = (*env)->NewObject( env, PwrtObjid_id, PwrtObjid_cid,
oix, vid);
body = (jint) MsgP->Object.Body;
offset = (jint) MsgP->Object.Offset;
size = (jint) MsgP->Object.Size;
flags = (jint) MsgP->Object.Flags.m;
attrref_obj = (*env)->NewObject( env, PwrtAttrRef_id, PwrtAttrRef_cid,
objid_obj, body, offset, size, flags);
oix = (jint) MsgP->SupObject.Objid.oix;
vid = (jint) MsgP->SupObject.Objid.vid;
supobjid_obj = (*env)->NewObject( env, PwrtObjid_id, PwrtObjid_cid,
oix, vid);
body = (jint) MsgP->SupObject.Body;
offset = (jint) MsgP->SupObject.Offset;
size = (jint) MsgP->SupObject.Size;
flags = (jint) MsgP->SupObject.Flags.m;
supattrref_obj = (*env)->NewObject( env, PwrtAttrRef_id, PwrtAttrRef_cid,
supobjid_obj, body, offset, size, flags);
time_AtoAscii( &time, time_eFormat_ComprDateAndTime, time_str, sizeof(time_str));
time_AtoAscii( &birthTime, time_eFormat_ComprDateAndTime, birthTime_str, sizeof(birthTime_str));
// Convert to java strings
jevText = (*env)->NewStringUTF( env, "");
jevName = (*env)->NewStringUTF( env, MsgP->EventName);
jevTime = (*env)->NewStringUTF( env, time_str);
jevBirthTime = (*env)->NewStringUTF( env, birthTime_str);
jevTargetBirthTime = (*env)->NewStringUTF( env, "");
jevMoreText = (*env)->NewStringUTF( env, "");
// Convert to java int
jevFlags = (jint)MsgP->Info.EventFlags;
jevPrio = (jint)MsgP->Info.EventPrio;
jevStatus = (jint)MsgP->Status;
jevNix = (jint)MsgP->Info.Id.Nix;
jevIdx = (jint)MsgP->Info.Id.Idx;
jevType = (jint)MsgP->Info.EventType;
//anropa callback metoden i Mh-klassen
jevTargetNix = (jint)0;
jevTargetIdx = (jint)0;
// Call the callback method in the Mh class
(*env)->CallStaticVoidMethod( env, Mh_id, Mh_messReceived_id, jevText, jevName,
jevTime, jevFlags, jevPrio, jevStatus, jevNix, jevBirthTime, jevIdx,
jevTargetNix, jevTargetBirthTime, jevTargetIdx,
jevType, objid_obj);
//important:check if an exception was raised
if ((*env)->ExceptionCheck(env))
{
printf("exception i alarm\n");
jevType, attrref_obj, supattrref_obj, jevMoreText);
// Important, check if an exception was raised
if ((*env)->ExceptionCheck(env)) {
printf("Exception in alarm_bc\n");
return 1;
}
......@@ -567,11 +762,17 @@ pwr_tStatus ev_mh_info_bc( mh_sMessage *MsgP)
JNIEnv *env;
jclass PwrtObjid_id;
jmethodID PwrtObjid_cid;
jobject objid_obj = NULL;
jobject objid_obj = NULL;
jobject supobjid_obj = NULL;
jclass PwrtAttrRef_id;
jmethodID PwrtAttrRef_cid;
jobject attrref_obj = NULL;
jobject supattrref_obj = NULL;
jstring jevText;
jstring jevName;
jstring jevTime;
jstring jevBirthTime;
jstring jevMoreText;
jint jevFlags;
jint jevPrio;
jint jevStatus;
......@@ -579,16 +780,17 @@ pwr_tStatus ev_mh_info_bc( mh_sMessage *MsgP)
jint jevIdx;
jint jevType;
jint oix, vid;
jint body, offset, size, flags;
jstring jevTargetBirthTime;
jint jevTargetNix = (jint) 0;
jint jevTargetIdx = (jint) 0;
jint jevTargetNix;
jint jevTargetIdx;
char time_str[40];
char birthTime_str[40];
pwr_tObjid objid = MsgP->Object.Objid;
pwr_tTime time = net_NetTimeToTime( &MsgP->Info.EventTime);
pwr_tTime birthTime = net_NetTimeToTime( &MsgP->Info.Id.BirthTime);
......@@ -600,39 +802,65 @@ pwr_tStatus ev_mh_info_bc( mh_sMessage *MsgP)
PwrtObjid_cid = (*env)->GetMethodID( env, PwrtObjid_id,
"<init>", "(II)V");
oix = (jint) objid.oix;
vid = (jint) objid.vid;
PwrtAttrRef_id = (*env)->FindClass( env, "jpwr/rt/PwrtAttrRef");
PwrtAttrRef_cid = (*env)->GetMethodID( env, PwrtAttrRef_id,
"<init>", "(Ljpwr/rt/PwrtObjid;IIII)V");
oix = (jint) MsgP->Object.Objid.oix;
vid = (jint) MsgP->Object.Objid.vid;
objid_obj = (*env)->NewObject( env, PwrtObjid_id, PwrtObjid_cid,
oix, vid);
body = (jint) MsgP->Object.Body;
offset = (jint) MsgP->Object.Offset;
size = (jint) MsgP->Object.Size;
flags = (jint) MsgP->Object.Flags.m;
attrref_obj = (*env)->NewObject( env, PwrtAttrRef_id, PwrtAttrRef_cid,
objid_obj, body, offset, size, flags);
oix = (jint) MsgP->SupObject.Objid.oix;
vid = (jint) MsgP->SupObject.Objid.vid;
supobjid_obj = (*env)->NewObject( env, PwrtObjid_id, PwrtObjid_cid,
oix, vid);
body = (jint) MsgP->SupObject.Body;
offset = (jint) MsgP->SupObject.Offset;
size = (jint) MsgP->SupObject.Size;
flags = (jint) MsgP->SupObject.Flags.m;
supattrref_obj = (*env)->NewObject( env, PwrtAttrRef_id, PwrtAttrRef_cid,
supobjid_obj, body, offset, size, flags);
time_AtoAscii( &time, time_eFormat_ComprDateAndTime, time_str, sizeof(time_str));
time_AtoAscii( &birthTime, time_eFormat_ComprDateAndTime, birthTime_str, sizeof(birthTime_str));
//gr om till Java-strngar
// Convert to java strings
jevText = (*env)->NewStringUTF( env, MsgP->EventText);
jevName = (*env)->NewStringUTF( env, MsgP->EventName);
jevTime = (*env)->NewStringUTF( env, time_str);
jevBirthTime = (*env)->NewStringUTF( env, birthTime_str);
jevTargetBirthTime = (*env)->NewStringUTF( env, "");
jevMoreText = (*env)->NewStringUTF( env, MsgP->EventMoreText);
jevTargetBirthTime = (*env)->NewStringUTF( env, " ");
//gr om till Java-int
// Convert to java int
jevFlags = (jint)MsgP->Info.EventFlags;
jevPrio = (jint)MsgP->Info.EventPrio;
jevStatus = (jint)MsgP->Status;
jevNix = (jint)MsgP->Info.Id.Nix;
jevIdx = (jint)MsgP->Info.Id.Idx;
jevType = (jint)MsgP->Info.EventType;
//anropa callback metoden i Mh-klassen
jevTargetNix = (jint)0;
jevTargetIdx = (jint)0;
// Call the callback method in the Mh class
(*env)->CallStaticVoidMethod( env, Mh_id, Mh_messReceived_id, jevText, jevName,
jevTime, jevFlags, jevPrio, jevStatus, jevNix, jevBirthTime, jevIdx,
jevTargetNix, jevTargetBirthTime, jevTargetIdx,
jevType, objid_obj);
//important:check if an exception was raised
if ((*env)->ExceptionCheck(env))
{
printf("exception i info\n");
jevType, attrref_obj, supattrref_obj, jevMoreText);
// Important, check if an exception was raised
if ((*env)->ExceptionCheck(env)) {
printf("Exception in alarm_bc\n");
return 1;
}
......@@ -666,4 +894,9 @@ pwr_tStatus ev_mh_clear_alarmlist_bc( pwr_tNodeIndex nix)
return 1;
}
pwr_tStatus ev_mh_clear_blocklist_bc( pwr_tNodeIndex nix) {
// TODO
return 1;
}
/*slut p frn xtt_ev.cpp*/
java/jpwr/rt/src/GdhWebSocketServer.java
View file @ 0d5bcba0
......@@ -58,6 +58,7 @@ import javax.swing.*;
*/
public class GdhWebSocketServer
{
public final static int graph_eType_Bit = (1 << 15) + 1;
public final static int SET_OBJECT_INFO_BOOLEAN = 1;
public final static int SET_OBJECT_INFO_FLOAT = 2;
public final static int SET_OBJECT_INFO_INT = 3;
......@@ -123,10 +124,15 @@ public class GdhWebSocketServer
public final static int GET_OBJECT = 63;
public final static int GET_OPWIND_MENU = 64;
public final static int GET_OBJECT_FROM_NAME = 65;
public final static int MH_SYNC = 66;
public final static int MH_ACK = 67;
public final static int GET_OBJECT_FROM_AREF = 68;
public final static int GET_OP_SELF = 1;
public final static int GET_OP_METHOD_PLC = 2;
public final static int GET_OP_METHOD_OBJECTGRAPH = 3;
public final static int GET_OP_METHOD_GRAPH = 4;
public final static int GET_OP_METHOD_HELPCLASS = 5;
public final static int PORT = 4448;
......@@ -143,13 +149,18 @@ public class GdhWebSocketServer
static int totalThreadCount = 0;
Gdh gdh;
Errh errh;
Mh mh;
MhData mhData;
int maxConnections;
String currentConnectionsStr;
static boolean ignoreHandler = false;
boolean[] connectionOccupied;
int maxAlarms;
int maxEvents;
PwrtObjid handlerOid = null;
static boolean log = false;
static boolean logRefInfoAll = false;
static boolean logStatistics = false;
static boolean debug = true;
static boolean debug = false;
static int lastIndexReffed = 0;
......@@ -170,10 +181,7 @@ public class GdhWebSocketServer
public static void main(String[] args) {
System.out.println( "java.library.path = " + System.getProperty("java.library.path"));
for( int i = 0; i < args.length; i++) {
if( args[i].equals("-i")) {
ignoreHandler = true;
}
else if ( args[i].equals("-l")) {
if ( args[i].equals("-l")) {
log = true;
}
else if ( args[i].equals("-logRefInfoAll")) {
......@@ -208,10 +216,6 @@ public class GdhWebSocketServer
@return The handlerObject value
*/
private int getHandlerObject() {
if ( ignoreHandler) {
maxConnections = 50;
return 1;
}
CdhrObjid cdhrObjid;
CdhrString cdhrString;
CdhrInt cdhrInt;
......@@ -220,21 +224,44 @@ public class GdhWebSocketServer
if(cdhrObjid.evenSts()) {
errh.info("No WebSocketServer is configured, WebSocketServer terminating");
return cdhrObjid.getSts();
}
cdhrString = gdh.objidToName(cdhrObjid.objid, Cdh.mName_volumeStrict);
if( cdhrString.evenSts())
return cdhrString.getSts();
}
handlerOid = cdhrObjid.objid;
cdhrString = gdh.objidToName(handlerOid, Cdh.mName_volumeStrict);
if( cdhrString.evenSts())
return cdhrString.getSts();
String attr = cdhrString.str + ".MaxConnections";
cdhrInt = gdh.getObjectInfoInt(attr);
if(cdhrInt.evenSts())
return cdhrInt.getSts();
String attr = cdhrString.str + ".MaxConnections";
cdhrInt = gdh.getObjectInfoInt(attr);
if(cdhrInt.evenSts())
return cdhrInt.getSts();
maxConnections = cdhrInt.value;
currentConnectionsStr = cdhrString.str + ".CurrentConnections";
setCurrentConnections(threadCount);
errh.info("WebSocketServer started, MaxConnections: " + maxConnections);
return 1;
maxConnections = cdhrInt.value;
attr = cdhrString.str + ".MaxNoOfAlarms";
cdhrInt = gdh.getObjectInfoInt(attr);
if(cdhrInt.evenSts())
return cdhrInt.getSts();
maxAlarms = cdhrInt.value;
if (maxAlarms <= 0)
maxAlarms = 100;
attr = cdhrString.str + ".MaxNoOfEvents";
cdhrInt = gdh.getObjectInfoInt(attr);
if(cdhrInt.evenSts())
return cdhrInt.getSts();
maxEvents = cdhrInt.value;
if( maxEvents <= 0)
maxEvents = 200;
connectionOccupied = new boolean[maxConnections];
currentConnectionsStr = cdhrString.str + ".CurrentConnections";
setCurrentConnections(threadCount);
errh.info("WebSocketServer started, MaxConnections: " + maxConnections);
System.out.println("MaxConnections: " + maxConnections);
return 1;
}
......@@ -246,8 +273,7 @@ public class GdhWebSocketServer
private void setCurrentConnections(int connections) {
PwrtStatus sts;
if(!ignoreHandler)
sts = gdh.setObjectInfo(currentConnectionsStr, connections);
sts = gdh.setObjectInfo(currentConnectionsStr, connections);
}
......@@ -280,11 +306,24 @@ public class GdhWebSocketServer
System.exit(0);
}
mh = new Mh((Object)null, maxAlarms, maxEvents);
mhData = new MhData(maxAlarms, maxEvents);
PwrtStatus stsM = mh.outunitConnect(handlerOid);
if(stsM.evenSts())
{
System.out.println("Fel vid outunitConnect");
errh.setStatus( Errh.PWR__SRVTERM);
return;
}
MhSendThread mhSendThread = new MhSendThread(mh);
errh.setStatus( Errh.PWR__SRUN);
Qcom qcom = new Qcom();
QcomrCreateQ qque = qcom.createIniEventQ("WebSocketServer");
if( qque.evenSts()) {
errh.fatal("WebSocketServer couldn create EventQue");
errh.fatal("WebSocketServer couldn't create EventQue");
return;
}
......@@ -315,14 +354,25 @@ public class GdhWebSocketServer
errh.error("Accept failed.");
continue;
}
if(threadCount <= maxConnections) {
// Find free slot
int threadNumber = -1;
for ( int i = 0; i < maxConnections; i++) {
if ( !connectionOccupied[i]) {
threadNumber = i;
connectionOccupied[i] = true;
break;
}
}
if ( threadNumber >= 0) {
// Create a new thread
System.out.println("New thread " + threadNumber);
threadCount++;
totalThreadCount++;
setCurrentConnections(threadCount);
GdhThread gdhThread = new GdhThread(cliSocket, totalThreadCount, maxConnections);
GdhThread gdhThread = new GdhThread(cliSocket, threadNumber, maxConnections);
}
else {
System.out.println("Max number of threads exceeded");
errh.warning("Connection dismissed, max number of connections exceeded");
try {
cliSocket.close();
......@@ -335,6 +385,38 @@ public class GdhWebSocketServer
}
private class MhSendThread extends Thread {
Mh mh;
boolean keepRunning = true;
public MhSendThread(Mh mh) {
this.mh = mh;
start();
}
public void run() {
PwrtStatus stsM = new PwrtStatus(0);
while (this.keepRunning) {
try {
if (mh.hasNewMessArrived()) {
MhrEvent newMess = mh.getNewMess();
synchronized(mhData) {
mhData.insertNewMess(newMess);
}
System.out.println("New mh message " + newMess.syncIdx + " " + newMess.eventId.idx + " " + newMess.eventText);
}
stsM = mh.outunitReceive();
Thread.sleep(1);
}
catch(Exception e) {
if(log)
System.out.println("Exception i run mhSendThread " + e.toString());
}
}
}
}
private class GdhThread extends Thread {
Socket clientSocket;
public Vector<Sub> thSub = new Vector<Sub>();
......@@ -362,7 +444,6 @@ public class GdhWebSocketServer
class SendSub extends TimerTask {
public void run() {
System.out.println( "SendSub");
int id = 5678;
int sts = 123;
int size = 0;
......@@ -414,7 +495,8 @@ public class GdhWebSocketServer
bb.putInt( j, 1);
j += 4;
boolean value = gdh.getObjectRefInfoBoolean(sub.id);
System.out.println( i + " Value: " + value + " Type " + sub.typeId + " " + (15+size) + " " + j);
if ( debug)
System.out.println( i + " Value: " + value + " Type " + sub.typeId + " " + (15+size) + " " + j);
bb.put( j, value ? (byte)1 : (byte)0);
j += 1;
break;
......@@ -461,7 +543,6 @@ public class GdhWebSocketServer
Matcher get = Pattern.compile("^GET").matcher(data);
if ( get.find()) {
System.out.println("Match GET");
Matcher match = Pattern.compile("Sec-WebSocket-Key: (.*)").matcher(data);
match.find();
byte[] response = ("HTTP/1.1 101 Switching Protocols\r\n"
......@@ -475,7 +556,6 @@ public class GdhWebSocketServer
.getBytes("UTF-8")))
+ "\r\n\r\n")
.getBytes("UTF-8");
System.out.println("Sending " + response);
out.write(response, 0, response.length);
in = new BufferedInputStream(instream);
......@@ -483,6 +563,7 @@ public class GdhWebSocketServer
}
catch(IOException e) {
errh.error("DataStream failed");
connectionOccupied[threadNumber] = false;
threadCount--;
setCurrentConnections(threadCount);
return;
......@@ -507,13 +588,11 @@ public class GdhWebSocketServer
if ( size < 0)
continue;
//System.out.println( "Received: " + c1 + " " + c2 + " " + size);
int[] key = new int[4];
key[0] = in.read();
key[1] = in.read();
key[2] = in.read();
key[3] = in.read();
//System.out.println( "Key : " + key[0] + " " + key[1] + " " + key[2] + " " + key[3]);
switch ( opcode) {
case 1:
......@@ -532,9 +611,13 @@ public class GdhWebSocketServer
value[i] = (byte)(c ^ key[i & 0x3]);
}
int reason = ((value[1] & 0xFF) << 0) + ((value[0] & 0xFF) << 8);
System.out.println( "Opcode 8, Connection closed, reason: " + reason);
System.out.println( "Thread " + threadNumber + " closed, Opcode 8, reason: " + reason);
if ( timer != null)
timer.cancel();
connectionOccupied[threadNumber] = false;
threadCount--;
setCurrentConnections(threadCount);
return;
default:
System.out.println( "Unknown opcode: " + opcode);
......@@ -548,8 +631,6 @@ public class GdhWebSocketServer
int id = ((value[2] & 0xFF) << 0) + ((value[3] & 0xFF) << 8) + ((value[4] & 0xFF) << 16) + ((value[5] & 0xFF) << 24);
//System.out.println( "id: " + id);
switch ( value[0]) {
case GET_OBJECT_INFO_BOOLEAN:
try {
......@@ -727,9 +808,7 @@ public class GdhWebSocketServer
i += 4;
int nameSize = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8);
i += 2;
System.out.println( "val: " + val + "nameSize: " + nameSize);
String attrName = new String( value, i, nameSize);
System.out.println( "attrName : " + attrName);
PwrtStatus ret = gdh.setObjectInfo( attrName, bvalue);
int sts = ret.getSts();
......@@ -764,9 +843,7 @@ public class GdhWebSocketServer
i += 4;
int nameSize = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8);
i += 2;
System.out.println( "val: " + ivalue + "nameSize: " + nameSize);
String attrName = new String( value, i, nameSize);
System.out.println( "attrName : " + attrName);
PwrtStatus ret = gdh.setObjectInfo( attrName, ivalue);
int sts = ret.getSts();
......@@ -801,9 +878,7 @@ public class GdhWebSocketServer
i += 4;
int nameSize = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8);
i += 2;
System.out.println( "val: " + fvalue + " nameSize: " + nameSize);
String attrName = new String( value, i, nameSize);
System.out.println( "attrName : " + attrName);
PwrtStatus ret = gdh.setObjectInfo( attrName, fvalue);
int sts = ret.getSts();
......@@ -842,9 +917,7 @@ public class GdhWebSocketServer
int nameSize = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8);
i += 2;
System.out.println( "val: " + val + "nameSize: " + nameSize);
String attrName = new String( value, i, nameSize);
System.out.println( "attrName : " + attrName);
PwrtStatus ret = gdh.setObjectInfo( attrName, val);
int sts = ret.getSts();
......@@ -878,7 +951,6 @@ public class GdhWebSocketServer
int nameSize = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8);
i += 2;
String attrName = new String( value, i, nameSize);
System.out.println( "attrName : " + attrName);
PwrtStatus ret = gdh.toggleObjectInfo( attrName);
int sts = ret.getSts();
......@@ -908,6 +980,7 @@ public class GdhWebSocketServer
break;
case REF_OBJECT_INFO:
try {
int sts;
int i = 6;
int refId = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8) + ((value[i+2] & 0xFF) << 16) + ((value[i+3] & 0xFF) << 24);
i += 4;
......@@ -915,23 +988,24 @@ public class GdhWebSocketServer
i += 4;
int nameSize = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8) + ((value[i+2] & 0xFF) << 16) + ((value[i+3] & 0xFF) << 24);
i += 4;
System.out.println( "nameSize: " + nameSize);
String attrName = new String( value, i, nameSize);
System.out.println( "attrName : " + attrName + " " + threadNumber + " " + refId);
Sub ret = this.refObjectInfo(attrName, threadNumber, refId, elements);
System.out.println( "ret.sts " + ret.getSts() + " sub.subscriptionsIndex " + ret.subscriptionsIndex);
if ( ret.oddSts())
thSub.add(ret);
attrName = checkAttrName( attrName);
if ( attrName != null) {
Sub ret = this.refObjectInfo(attrName, threadNumber, refId, elements);
if ( ret.oddSts())
thSub.add(ret);
int sts = ret.getSts();
// if ( debug)
System.out.println( "refObjectInfo: " + id + " refId " + refId + " subidx " + ret.subscriptionsIndex + " " + attrName + " sts: " + ret.getSts() + " type " + ret.typeId);
sts = ret.getSts();
if ( debug)
System.out.println( "refObjectInfo: " + id + " refId " + refId + " subidx " + ret.subscriptionsIndex + " " + attrName + " sts: " + ret.getSts() + " type " + ret.typeId);
}
i += nameSize;
for ( int k = 0; k < thSub.size(); k++) {
if ( thSub.elementAt(k) == null)
continue;
System.out.println( "thSub rcv " + k + " subidx " + ((Sub)thSub.elementAt(k)).subscriptionsIndex + " thSub " + thSub.elementAt(k));
if ( debug)
System.out.println( "thSub rcv " + k + " subidx " + ((Sub)thSub.elementAt(k)).subscriptionsIndex + " thSub " + thSub.elementAt(k));
}
sts = 111;
......@@ -980,7 +1054,6 @@ public class GdhWebSocketServer
if ( !found)
break;
System.out.println("UnrefObjectInfo: " + subId + " refId: " + tsub.refid.rix);
PwrtStatus rsts = this.unrefObjectInfo( tsub.subId, threadNumber);
thSub.set( idx, null);
......@@ -1011,6 +1084,7 @@ public class GdhWebSocketServer
break;
case REF_OBJECT_INFO_LIST:
try {
int sts;
int i = 6;
int subSize = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8) + ((value[i+2] & 0xFF) << 16) + ((value[i+3] & 0xFF) << 24);
i += 4;
......@@ -1021,23 +1095,24 @@ public class GdhWebSocketServer
i += 4;
int nameSize = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8) + ((value[i+2] & 0xFF) << 16) + ((value[i+3] & 0xFF) << 24);
i += 4;
System.out.println( "nameSize: " + nameSize);
String attrName = new String( value, i, nameSize);
System.out.println( "attrName : " + attrName + " " + threadNumber + " " + refId);
Sub ret = this.refObjectInfo(attrName, threadNumber, refId, elements);
System.out.println( "ret.sts " + ret.getSts() + " sub.subscriptionsIndex " + ret.subscriptionsIndex);
thSub.add(ret);
System.out.println( " sub " + ret.subscriptionsIndex + " thSub " + ((Sub)thSub.elementAt(j)).subscriptionsIndex + " sub " + ret + " thSub " + thSub.elementAt(j));
attrName = checkAttrName( attrName);
if ( attrName != null) {
Sub ret = this.refObjectInfo(attrName, threadNumber, refId, elements);
thSub.add(ret);
sts = ret.getSts();
if ( debug)
System.out.println( "refObjectInfoList: " + id + " refId " + refId + " subidx " + ret.subscriptionsIndex + " " + attrName + " sts: " + ret.getSts() + " type " + ret.typeId);
}
int sts = ret.getSts();
// if ( debug)
System.out.println( "refObjectInfoList: " + id + " refId " + refId + " subidx " + ret.subscriptionsIndex + " " + attrName + " sts: " + ret.getSts() + " type " + ret.typeId);
i += nameSize;
}
for ( int k = 0; k < thSub.size(); k++)
if ( debug)
for ( int k = 0; k < thSub.size(); k++)
System.out.println( "thSub rcv " + k + " subidx " + ((Sub)thSub.elementAt(k)).subscriptionsIndex + " thSub " + thSub.elementAt(k));
int sts = 111;
sts = 111;
byte[] msg = new byte[11];
msg[0] = (byte)130;
msg[1] = 9;
......@@ -1073,11 +1148,14 @@ public class GdhWebSocketServer
continue;
switch( asub.typeId) {
case Pwr.eType_Boolean:
refsize += 8 + 1;
if ( asub.elements <= 1)
refsize += 8 + 1;
else
refsize += 8 + asub.elements * 1;
cnt++;
break;
case Pwr.eType_Float32:
if ( asub.elements < 1)
if ( asub.elements <= 1)
refsize += 8 + 4;
else
refsize += 8 + asub.elements * 4;
......@@ -1090,9 +1168,14 @@ public class GdhWebSocketServer
case Pwr.eType_UInt16:
case Pwr.eType_UInt32:
case Pwr.eType_Status:
case Pwr.eType_NetStatus:
case Pwr.eType_Mask:
case Pwr.eType_Enum:
refsize += 8 + 4;
case graph_eType_Bit:
if ( asub.elements <= 1)
refsize += 8 + 4;
else
refsize += 8 + asub.elements * 4;
cnt++;
break;
case Pwr.eType_String:
......@@ -1100,15 +1183,27 @@ public class GdhWebSocketServer
case Pwr.eType_DeltaTime:
case Pwr.eType_AttrRef:
case Pwr.eType_Objid:
refsize += 8 + 2;
String svalue = gdh.getObjectRefInfoString(asub.id, asub.typeId);
refsize += svalue.length();
if ( asub.elements <= 1) {
refsize += 8 + 2;
String svalue = gdh.getObjectRefInfoString(asub.id, asub.typeId);
refsize += svalue.length();
}
else {
refsize += 8;
String[] svalue = gdh.getObjectRefInfoStringArray(asub.id, asub.typeId,
asub.size, asub.elements);
for ( int l = 0; l < asub.elements; l++) {
if ( l < svalue.length)
refsize += 2 + svalue[l].length();
else
refsize += 2;
}
}
cnt++;
break;
default:
continue;
}
System.out.println("GetAll " + cnt + " " + refsize);
}
......@@ -1153,18 +1248,33 @@ public class GdhWebSocketServer
j += 4;
for ( int i = 0; i < thSub.size(); i++) {
Sub asub = (Sub)thSub.elementAt(i);
if ( asub == null)
if ( asub == null || asub.subscriptionsIndex == -1)
continue;
switch( asub.typeId) {
case Pwr.eType_Boolean:
bb.putInt( j, asub.subscriptionsIndex);
j += 4;
bb.putInt( j, 1);
j += 4;
boolean bvalue = gdh.getObjectRefInfoBoolean(asub.id);
bb.put( j, bvalue ? (byte)1 : (byte)0);
j += 1;
System.out.println( i + " Idx " + asub.subscriptionsIndex + " Value: " + bvalue + " Type " + asub.typeId + " " + (refsize) + " " + (j-jstart));
if ( asub.elements <= 1) {
bb.putInt( j, 1);
j += 4;
boolean bvalue = gdh.getObjectRefInfoBoolean(asub.id);
bb.put( j, bvalue ? (byte)1 : (byte)0);
j += 1;
if ( debug)
System.out.println( i + " Idx " + asub.subscriptionsIndex + " Value: " + bvalue + " Type " + asub.typeId + " " + (refsize) + " " + (j-jstart));
}
else {
bb.putInt( j, asub.elements);
j += 4;
boolean[] bvalue = gdh.getObjectRefInfoBooleanArray(asub.id, asub.elements);
for ( int k = 0; k < asub.elements; k++) {
if ( k < bvalue.length)
bb.put( j, bvalue[k] ? (byte)1 : (byte)0);
else
bb.put( j, (byte)0);
j += 1;
}
}
break;
case Pwr.eType_Float32:
bb.putInt( j, asub.subscriptionsIndex);
......@@ -1172,10 +1282,10 @@ public class GdhWebSocketServer
if ( asub.elements <= 1) {
bb.putInt( j, 4);
j += 4;
float fvalue = gdh.getObjectRefInfoFloat(asub.id);
bb.putFloat( j, fvalue);
float fvalue = gdh.getObjectRefInfoFloat(asub.id); bb.putFloat( j, fvalue);
j += 4;
System.out.println( i + " Idx " + asub.subscriptionsIndex + " Value: " + fvalue + " Type " + asub.typeId + " " + (refsize) + " " + (j-jstart));
if ( debug)
System.out.println( i + " Idx " + asub.subscriptionsIndex + " Value: " + fvalue + " Type " + asub.typeId + " " + (refsize) + " " + (j-jstart));
}
else {
bb.putInt( j, asub.elements * 4);
......@@ -1188,7 +1298,8 @@ public class GdhWebSocketServer
bb.putFloat( j, 0F);
j += 4;
}
System.out.println( i + " Idx " + asub.subscriptionsIndex + " Value: " + fvalue[0] + " Type " + asub.typeId + " " + asub.elements + " " + (refsize) + " " + (j-jstart));
if ( debug)
System.out.println( i + " Idx " + asub.subscriptionsIndex + " Value: " + fvalue[0] + " Type " + asub.typeId + " " + asub.elements + " " + (refsize) + " " + (j-jstart));
}
break;
case Pwr.eType_Int8:
......@@ -1198,17 +1309,33 @@ public class GdhWebSocketServer
case Pwr.eType_UInt16:
case Pwr.eType_UInt32:
case Pwr.eType_Status:
case Pwr.eType_NetStatus:
case Pwr.eType_Mask:
case Pwr.eType_Enum:
case graph_eType_Bit:
bb.putInt( j, asub.subscriptionsIndex);
j += 4;
bb.putInt( j, 4);
j += 4;
System.out.println( "getObjectRefInfoInt " + asub.id);
int ivalue = gdh.getObjectRefInfoInt(asub.id);
bb.putInt( j, ivalue);
j += 4;
System.out.println( i + " Idx " + asub.subscriptionsIndex + " Value: " + ivalue + " Type " + asub.typeId + " " + (refsize) + " " + (j-jstart));
if ( asub.elements <= 1) {
bb.putInt( j, 4);
j += 4;
int ivalue = gdh.getObjectRefInfoInt(asub.id);
bb.putInt( j, ivalue);
j += 4;
if ( debug)
System.out.println( i + " Idx " + asub.subscriptionsIndex + " Value: " + ivalue + " Type " + asub.typeId + " " + (refsize) + " " + (j-jstart));
}
else {
bb.putInt( j, 4 * asub.elements);
j += 4;
int[] ivalue = gdh.getObjectRefInfoIntArray(asub.id, asub.elements);
for ( int k = 0; k < asub.elements; k++) {
if ( k < ivalue.length)
bb.putInt( j, ivalue[i]);
else
bb.putInt( j, 0);
j += 4;
}
}
break;
case Pwr.eType_String:
case Pwr.eType_Time:
......@@ -1217,15 +1344,45 @@ public class GdhWebSocketServer
case Pwr.eType_Objid:
bb.putInt( j, asub.subscriptionsIndex);
j += 4;
String svalue = gdh.getObjectRefInfoString(asub.id, asub.typeId);
bb.putInt( j, 2 + svalue.length());
j += 4;
bb.putShort( j, (short)svalue.length());
j += 2;
for ( int k = 0; k < svalue.length(); k++) {
bb.put( j++, (byte)svalue.charAt(k));
if ( asub.elements <= 1) {
String svalue = gdh.getObjectRefInfoString(asub.id, asub.typeId);
bb.putInt( j, 2 + svalue.length());
j += 4;
bb.putShort( j, (short)svalue.length());
j += 2;
for ( int k = 0; k < svalue.length(); k++) {
bb.put( j++, (byte)svalue.charAt(k));
}
if ( debug)
System.out.println( i + " Idx " + asub.subscriptionsIndex + " Value: " + svalue + " Type " + asub.typeId + " " + (refsize) + " " + (j-jstart));
}
else {
String[] svalue = gdh.getObjectRefInfoStringArray(asub.id, asub.typeId,
asub.size, asub.elements);
int len = 0;
for ( int l = 0; l < asub.elements; l++) {
if ( l < svalue.length)
len += 2 + svalue[l].length();
else
len += 2;
}
bb.putInt( j, len);
j += 4;
for ( int l = 0; l < asub.elements; l++) {
if ( l < svalue.length) {
bb.putShort( j, (short)svalue[l].length());
j += 2;
for ( int k = 0; k < svalue[l].length(); k++) {
bb.put( j++, (byte)svalue[l].charAt(k));
}
}
else {
bb.putShort( j, (short)0);
len += 2;
}
}
}
System.out.println( i + " Idx " + asub.subscriptionsIndex + " Value: " + svalue + " Type " + asub.typeId + " " + (refsize) + " " + (j-jstart));
break;
default:
System.out.println( "***" + i + " Idx " + asub.subscriptionsIndex + " Type " + asub.typeId + " " + (refsize) + " " + (j-jstart));
......@@ -1391,7 +1548,7 @@ public class GdhWebSocketServer
i += 4;
objid.oix = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8) + ((value[i+2] & 0xFF) << 16) + ((value[i+3] & 0xFF) << 24);
i += 4;
System.out.println("GetAllClassAttr " + classid + " " + objid.vid + " " + objid.oix);
Vector<CdhrObjAttr> v = gdh.getAllClassAttributes(classid, objid);
for ( int j = 0; j < v.size(); j++) {
CdhrObjAttr ve = v.get(j);
......@@ -1476,11 +1633,16 @@ public class GdhWebSocketServer
break;
}
case GET_OBJECT:
case GET_OBJECT_FROM_AREF:
case GET_OBJECT_FROM_NAME: {
try {
int sts = 1;
boolean isAref = true;
PwrtObjid objid = new PwrtObjid( 0, 0);
PwrtObjid retobjid = new PwrtObjid( 0, 0);
PwrtAttrRef aref = null;
PwrtAttrRef retaref = null;
String param1 = "";
int i = 6;
int op = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8);
i += 2;
......@@ -1489,6 +1651,25 @@ public class GdhWebSocketServer
i += 4;
objid.oix = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8) + ((value[i+2] & 0xFF) << 16) + ((value[i+3] & 0xFF) << 24);
i += 4;
isAref = false;
System.out.println("GetObject1 " + sts);
}
else if ( value[0] == GET_OBJECT_FROM_AREF) {
objid.vid = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8) + ((value[i+2] & 0xFF) << 16) + ((value[i+3] & 0xFF) << 24);
i += 4;
objid.oix = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8) + ((value[i+2] & 0xFF) << 16) + ((value[i+3] & 0xFF) << 24);
i += 4;
aref = new PwrtAttrRef(objid);
aref.offset = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8) + ((value[i+2] & 0xFF) << 16) + ((value[i+3] & 0xFF) << 24);
i += 4;
aref.body = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8) + ((value[i+2] & 0xFF) << 16) + ((value[i+3] & 0xFF) << 24);
i += 4;
aref.size = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8) + ((value[i+2] & 0xFF) << 16) + ((value[i+3] & 0xFF) << 24);
i += 4;
aref.flags = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8) + ((value[i+2] & 0xFF) << 16) + ((value[i+3] & 0xFF) << 24);
i += 4;
isAref = true;
System.out.println("GetObject1 " + sts);
}
else {
int nameSize = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8);
......@@ -1496,14 +1677,15 @@ public class GdhWebSocketServer
String objName = new String( value, i, nameSize);
i += nameSize;
CdhrObjid oret = gdh.nameToObjid(objName);
if ( oret.evenSts())
sts = oret.getSts();
CdhrAttrRef aret = gdh.nameToAttrRef(objName);
if ( aret.evenSts())
sts = aret.getSts();
else {
objid = oret.objid;
aref = aret.aref;
objid = aret.aref.objid;
}
}
System.out.println( "GET_OBJECT " + op +": " + objid.vid + " " + objid.oix);
System.out.println("GetObject2 " + sts);
if ( (sts & 1) != 0) {
switch ( op) {
case GET_OP_METHOD_PLC: {
......@@ -1514,27 +1696,88 @@ public class GdhWebSocketServer
break;
}
if ( cdhrClassId.classId == Pwrb.cClass_plc) {
CdhrObjid cdhrObjid = (CdhrObjid)gdh.getChild(objid);
CdhrObjid cdhrObjid = gdh.getChild(objid);
if ( cdhrObjid.evenSts()) {
sts = cdhrObjid.getSts();
System.out.println("sts2 " + sts);
break;
}
retobjid = cdhrObjid.objid;
isAref = false;
}
else if ( cdhrClassId.classId == Pwrb.cClass_windowplc ||
cdhrClassId.classId == Pwrb.cClass_windowcond ||
cdhrClassId.classId == Pwrb.cClass_windoworderact ||
cdhrClassId.classId == Pwrb.cClass_windowsubstep) {
retobjid = objid;
isAref = false;
}
else {
retobjid.vid = objid.vid;
retobjid.oix = objid.oix;
// Check if parent is a plc window
CdhrObjid cdhrObjid = gdh.getParent(objid);
if ( cdhrObjid.evenSts()) {
sts = cdhrObjid.getSts();
break;
}
cdhrClassId = gdh.getObjectClass( cdhrObjid.objid);
if ( cdhrClassId.evenSts()) {
sts = cdhrClassId.getSts();
break;
}
if ( cdhrClassId.classId == Pwrb.cClass_windowplc ||
cdhrClassId.classId == Pwrb.cClass_windowcond ||
cdhrClassId.classId == Pwrb.cClass_windoworderact ||
cdhrClassId.classId == Pwrb.cClass_windowsubstep) {
retobjid = cdhrObjid.objid;
isAref = false;
param1 = gdh.objidToName( objid, Cdh.mName_object).str;
}
else {
// Check if any PlcConnect
String name;
if ( isAref)
name = gdh.attrRefToName( aref, Cdh.mName_pathStrict).str;
else
name = gdh.objidToName( objid, Cdh.mName_pathStrict).str;
name += ".PlcConnect";
CdhrString cstr = gdh.getObjectInfoString(name);
if ( cstr.evenSts()) {
sts = cstr.getSts();
break;
}
cdhrObjid = gdh.nameToObjid(cstr.str);
if ( cdhrObjid.evenSts()) {
sts = cdhrObjid.getSts();
break;
}
param1 = gdh.objidToName( cdhrObjid.objid, Cdh.mName_object).str;
cdhrObjid = gdh.getParent(cdhrObjid.objid);
if ( cdhrObjid.evenSts()) {
sts = cdhrObjid.getSts();
break;
}
retobjid = cdhrObjid.objid;
isAref = false;
}
}
break;
}
default:
retobjid.vid = objid.vid;
retobjid.oix = objid.oix;
if ( isAref)
retaref = aref;
else {
retobjid.vid = objid.vid;
retobjid.oix = objid.oix;
}
break;
}
}
System.out.println("sts3 " + sts);
String name = null;
String fullName = null;
......@@ -1542,40 +1785,65 @@ public class GdhWebSocketServer
String className = null;
CdhrObjid cdhrObjId;
int cid = 0;
CdhrClassId cdhrClassId;
boolean hasChildren = false;
String param1 = "";
System.out.println("GetObject3 " + sts);
if ( (sts & 1) != 0) {
cdhrClassId = gdh.getObjectClass(retobjid);
if(cdhrClassId.oddSts()) {
cid = cdhrClassId.classId;
CdhrObjid classObj = gdh.classIdToObjid(cdhrClassId.classId);
if (classObj.oddSts()) {
className = gdh.objidToName( classObj.objid, Cdh.mName_object).str;
fullName = gdh.objidToName( retobjid, Cdh.mName_pathStrict).str;
name = gdh.objidToName( retobjid, Cdh.mName_object).str;
CdhrString ret = gdh.getObjectInfoString(fullName + ".Description");
if (ret.oddSts())
description = ret.str;
else
description = "";
if (gdh.getChild(retobjid).oddSts()) {
hasChildren = true;
if ( isAref) {
CdhrTypeId cdhrTypeId = gdh.getAttrRefTid(aref);
if(cdhrTypeId.oddSts()) {
cid = cdhrTypeId.typeId;
CdhrObjid classObj = gdh.classIdToObjid(cid);
if (classObj.oddSts()) {
className = gdh.objidToName( classObj.objid, Cdh.mName_object).str;
fullName = gdh.attrRefToName( retaref, Cdh.mName_pathStrict).str;
name = gdh.attrRefToName( retaref, Cdh.mName_object).str;
CdhrString ret = gdh.getObjectInfoString(fullName + ".Description");
if (ret.oddSts())
description = ret.str;
else
description = "";
if (gdh.getChild(retaref.objid).oddSts()) {
hasChildren = true;
}
}
else
sts = classObj.getSts();
}
else
sts = classObj.getSts();
sts = cdhrTypeId.getSts();
}
else {
CdhrClassId cdhrClassId = gdh.getObjectClass(retobjid);
if(cdhrClassId.oddSts()) {
cid = cdhrClassId.classId;
CdhrObjid classObj = gdh.classIdToObjid(cdhrClassId.classId);
if (classObj.oddSts()) {
className = gdh.objidToName( classObj.objid, Cdh.mName_object).str;
fullName = gdh.objidToName( retobjid, Cdh.mName_pathStrict).str;
name = gdh.objidToName( retobjid, Cdh.mName_object).str;
CdhrString ret = gdh.getObjectInfoString(fullName + ".Description");
if (ret.oddSts())
description = ret.str;
else
description = "";
if (gdh.getChild(retobjid).oddSts()) {
hasChildren = true;
}
}
else {
sts = classObj.getSts();
System.out.println("GetObject4 " + sts);
}
}
else {
sts = cdhrClassId.getSts();
System.out.println("GetObject5 " + sts);
}
}
else
sts = cdhrClassId.getSts();
System.out.println( "sts: " + sts + " name " + fullName + " class " + className + " descr " + description);
if ( op == GET_OP_METHOD_OBJECTGRAPH && (sts & 1) != 0) {
String suffix = "";
cdhrClassId = gdh.getObjectClass( retobjid);
cid = cdhrClassId.classId;
String path = System.getenv("pwrp_web") + "/";
String pwgname;
while ( true) {
......@@ -1610,7 +1878,6 @@ public class GdhWebSocketServer
pwgname = sret.str.toLowerCase() + suffix;
File file = new File( path + pwgname + ".pwg");
System.out.println("Check file " + path + pwgname + ".pwg");
if ( file.exists()) {
param1 = pwgname;
break;
......@@ -1625,7 +1892,91 @@ public class GdhWebSocketServer
cid = rcid.classId;
}
}
else if ( op == GET_OP_METHOD_GRAPH && (sts & 1) != 0) {
String attr = fullName + ".DefGraph";
PwrtObjid oid = objid;
while ( true) {
System.out.println("Method graph test " + attr);
CdhrString xttgraph = gdh.getObjectInfoString( attr);
if ( xttgraph.oddSts() && !xttgraph.str.equals("")) {
attr = xttgraph.str + ".Action";
CdhrString actionRet = gdh.getObjectInfoString( attr);
if ( actionRet.evenSts()) return;
param1 = actionRet.str;
String instance = null;
attr = xttgraph.str + ".Object[0]";
CdhrString instanceRet = gdh.getObjectInfoString( attr);
if ( instanceRet.oddSts() && !instanceRet.str.equals("")) {
// Instance found
instance = instanceRet.str;
fullName = instance;
retobjid.vid = 0;
retobjid.oix = 0;
name = "";
className = "";
description = "";
hasChildren = false;
}
else {
// No instance
retobjid.vid = 0;
retobjid.oix = 0;
name = "";
fullName = "";
className = "";
description = "";
hasChildren = false;
}
break;
}
CdhrObjid cdhrObjid = gdh.getParent(oid);
if ( cdhrObjid.evenSts()) {
sts = cdhrObjid.getSts();
break;
}
oid = cdhrObjid.objid;
CdhrString sret = gdh.objidToName( cdhrObjid.objid, Cdh.mName_pathStrict);
System.out.println("Parent sts " + sret.getSts());
if ( sret.evenSts()) {
sts = sret.getSts();
break;
}
System.out.println("Parent " + sret.str);
attr = sret.str + ".DefGraph";
}
}
else if ( op == GET_OP_METHOD_HELPCLASS && (sts & 1) != 0) {
CdhrObjid cdhrObjid = gdh.classIdToObjid(cid);
if ( cdhrObjid.evenSts()) {
sts = cdhrObjid.getSts();
break;
}
CdhrString sret = gdh.objidToName( cdhrObjid.objid, Cdh.mName_volume);
String volname = sret.str.substring(0, sret.str.length()-1);
sret = gdh.objidToName( cdhrObjid.objid, Cdh.mName_object);
String classname = sret.str;
if ( classname.substring(0,1).equals("$"))
classname = classname.substring(1);
System.out.println("Help class " + volname + " " + classname);
if ( cdhrObjid.objid.vid < Cdh.cUserClassVolMin)
param1 = "/pwr_doc/en_us/orm/" + volname.toLowerCase() + "_" + classname.toLowerCase() + ".html";
else
param1 = "/pwrp_web/" + volname.toLowerCase() + "_" + classname.toLowerCase() + ".html";
System.out.println("File " + param1);
}
}
else
System.out.println("Get object " + sts);
int j;
int refsize = 0;
if ( (sts & 1) != 0) {
......@@ -1707,9 +2058,10 @@ public class GdhWebSocketServer
}
out.write( msg);
out.flush();
System.out.println("GetObject " + fullName);
}
catch ( IOException e) {
System.out.println("getAllClassAttributes: IO exception");
System.out.println("getObject: IO exception");
}
break;
}
......@@ -1744,7 +2096,6 @@ public class GdhWebSocketServer
refsize = 0;
}
else {
System.out.println( "crr " + cdhrString.str);
switch ( cid) {
case Pwrb.cClass_Di:
......@@ -1777,7 +2128,6 @@ public class GdhWebSocketServer
ctype = new int[crrlen];
for ( i = 0; i < crrlen; i++) {
System.out.println("Token : " + tokens[i]);
String[] subtokens = tokens[i].substring(1).split("\\s+");
name[i] = subtokens[0];
className[i] = subtokens[1];
......@@ -1792,11 +2142,11 @@ public class GdhWebSocketServer
if ( className[i].equals( "XttGraph"))
oret = gdh.nameToObjid(name[i]);
else {
System.out.println("Cossref : " + name[i]);
int idx = name[i].lastIndexOf('-');
if ( idx != -1) {
oret = gdh.nameToObjid(name[i].substring(0,idx));
System.out.println("pwrent " + name[i].substring(0,idx) + " " + oret.objid.vid + " " + oret.objid.oix);
if ( debug)
System.out.println("pwrent " + name[i].substring(0,idx) + " " + oret.objid.vid + " " + oret.objid.oix);
}
else
oret = gdh.nameToObjid(name[i]);
......@@ -1806,7 +2156,6 @@ public class GdhWebSocketServer
else {
oid[i] = new PwrtObjid(0,0);
}
System.out.println("oid " + oid[i].vid + " " + oid[i].oix);
}
refsize = 2; // Number of elements
......@@ -1905,7 +2254,6 @@ public class GdhWebSocketServer
CdhrObjid oret;
Vector<WebButton> v = new Vector<WebButton>();
System.out.println("OpPlace \"" + opPlace + "\"");
if ( opPlace.isEmpty()) {
// Get first
oret = gdh.getClassList( Pwrb.cClass_OpPlaceWeb);
......@@ -1992,12 +2340,10 @@ public class GdhWebSocketServer
break;
}
System.out.println("Child " + childName + " " + button.text + " " + button.name + " " + button.url);
}
cdhrObjId = gdh.getNextSibling(cdhrObjId.objid);
}
}
System.out.println( "GetOpwindMenu " + v.size());
int j;
int refsize = 0;
......@@ -2026,7 +2372,6 @@ public class GdhWebSocketServer
refsize += ve.url.length();
}
}
System.out.println("OpwinMenu refsize " + refsize);
byte[] msg;
if ( refsize + 11 < 125) {
msg = new byte[13 + refsize + 1]; // One extra byte needed for ByteBuffer ??
......@@ -2103,7 +2448,6 @@ public class GdhWebSocketServer
bb.put( j, (byte)ve.url.charAt(k));
j++;
}
System.out.println("Button " + ve.type + " " + ve.text.length() + " " + ve.name.length() + " " + ve.url.length() );
}
}
out.write( msg);
......@@ -2170,6 +2514,267 @@ public class GdhWebSocketServer
}
break;
case GET_MSG: {
try {
int i = 6;
int status = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8) + ((value[i+2] & 0xFF) << 16) + ((value[i+3] & 0xFF) << 24);
i += 4;
int j;
int refsize;
CdhrString ret = gdh.getMsgText(status);
int sts = ret.getSts();
if ( ret.oddSts())
refsize = 2 + ret.str.length();
else
refsize = 0;
byte[] msg;
if ( refsize + 13 < 125) {
msg = new byte[15 + refsize + 1]; // One extra byte needed for ByteBuffer ??
msg[0] = (byte)130;
msg[1] = (byte)(13 + refsize + 1);
j = 2;
}
else {
msg = new byte[17 + refsize + 1];
msg[0] = (byte)130;
msg[1] = (byte)126;
msg[2] = (byte)(((13 + refsize + 1) >> 8) & 0xFF);
msg[3] = (byte)((13 + refsize + 1) & 0xFF);
j = 4;
}
msg[j++] = GET_MSG;
msg[j++] = (byte)(id >> 24);
msg[j++] = (byte)((id >> 16) & 0xFF);
msg[j++] = (byte)((id >> 8) & 0xFF);
msg[j++] = (byte)(id & 0xFF);
msg[j++] = (byte)(sts >> 24);
msg[j++] = (byte)((sts >> 16) & 0xFF);
msg[j++] = (byte)((sts >> 8) & 0xFF);
msg[j++] = (byte)(sts & 0xFF);
if ( ret.oddSts()) {
ByteBuffer bb = ByteBuffer.wrap( msg);
bb.putShort( j, (short)ret.str.length());
j += 2;
for ( int k = 0; k < ret.str.length(); k++) {
bb.put( j++, (byte)ret.str.charAt(k));
}
}
out.write( msg);
out.flush();
}
catch(IOException e) {
System.out.println("getMsg: IO exception");
}
break;
}
case MH_SYNC: {
try {
int i = 6;
int syncIdx = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8) + ((value[i+2] & 0xFF) << 16) + ((value[i+3] & 0xFF) << 24);
i += 4;
int sts = 1;
Vector<MhrEvent> v = new Vector<MhrEvent>();
int j;
for ( j = 0; j < mhData.eventVec.size(); j++) {
if ( mhData.eventVec.get(j).syncIdx == syncIdx)
break;
}
for ( j--; j >= 0; j--)
v.add( mhData.eventVec.get(j));
int refsize = 0;
for ( j = v.size() - 1; j >= 0; j--) {
MhrEvent e = v.get(j);
System.out.println("Sync: " + j + " " + e.syncIdx + " " + e.eventText);
refsize += 2; // eventTime length
refsize += e.eventTime.length(); // eventTime
refsize += 2; // eventText length
refsize += e.eventText.length(); // eventText
refsize += 2; // eventName length
refsize += e.eventName.length(); // eventName
refsize += 4; // eventFlags
refsize += 4; // eventStatus
refsize += 4; // eventPrio
refsize += 4; // eventId.nix
refsize += 4; // eventId.idx
refsize += 2; // eventId.birthTime length
refsize += e.eventId.birthTime.length(); // eventId.birthTime
refsize += 4; // targetId.nix
refsize += 4; // targetId.idx
refsize += 2; // targetId.birthTime length
refsize += e.targetId.birthTime.length(); // targetId.birthTime
refsize += 4; // eventType
refsize += 4; // object.objid.vid
refsize += 4; // object.objid.oix
refsize += 4; // object.offset
refsize += 4; // object.body
refsize += 4; // object.size
refsize += 4; // object.flags
refsize += 4; // supObject.objid.vid
refsize += 4; // supObject.objid.oix
refsize += 4; // supObject.offset
refsize += 4; // supObject.body
refsize += 4; // supObject.size
refsize += 4; // supObject.flags
refsize += 2; // eventMoreText length
refsize += e.eventMoreText.length(); // eventMoreText
refsize += 4; // syncIdx
}
byte[] msg;
if ( refsize + 13 < 125) {
msg = new byte[15 + refsize + 1]; // One extra byte needed for ByteBuffer ??
msg[0] = (byte)130;
msg[1] = (byte)(13 + refsize + 1);
j = 2;
}
else {
msg = new byte[17 + refsize + 1];
msg[0] = (byte)130;
msg[1] = (byte)126;
msg[2] = (byte)(((13 + refsize + 1) >> 8) & 0xFF);
msg[3] = (byte)((13 + refsize + 1) & 0xFF);
j = 4;
}
msg[j++] = MH_SYNC;
msg[j++] = (byte)(id >> 24);
msg[j++] = (byte)((id >> 16) & 0xFF);
msg[j++] = (byte)((id >> 8) & 0xFF);
msg[j++] = (byte)(id & 0xFF);
msg[j++] = (byte)(sts >> 24);
msg[j++] = (byte)((sts >> 16) & 0xFF);
msg[j++] = (byte)((sts >> 8) & 0xFF);
msg[j++] = (byte)(sts & 0xFF);
ByteBuffer bb = ByteBuffer.wrap( msg);
bb.putInt( j, v.size());
j += 4;
for ( i = v.size() - 1; i >= 0; i--) {
MhrEvent e = v.get(i);
bb.putShort( j, (short)e.eventTime.length());
System.out.println("event " + e.syncIdx + " " + e.eventType + " " + e.eventPrio);
j += 2;
for ( int k = 0; k < e.eventTime.length(); k++)
bb.put( j++, (byte)e.eventTime.charAt(k));
bb.putShort( j, (short)e.eventText.length());
j += 2;
for ( int k = 0; k < e.eventText.length(); k++)
bb.put( j++, (byte)e.eventText.charAt(k));
bb.putShort( j, (short)e.eventName.length());
j += 2;
for ( int k = 0; k < e.eventName.length(); k++)
bb.put( j++, (byte)e.eventName.charAt(k));
bb.putInt( j, e.eventFlags);
j += 4;
bb.putInt( j, e.eventStatus);
j += 4;
bb.putInt( j, e.eventPrio);
j += 4;
bb.putInt( j, e.eventId.nix);
j += 4;
bb.putInt( j, e.eventId.idx);
j += 4;
bb.putShort( j, (short)e.eventId.birthTime.length());
j += 2;
for ( int k = 0; k < e.eventId.birthTime.length(); k++)
bb.put( j++, (byte)e.eventId.birthTime.charAt(k));
bb.putInt( j, e.targetId.nix);
j += 4;
bb.putInt( j, e.targetId.idx);
j += 4;
bb.putShort( j, (short)e.targetId.birthTime.length());
j += 2;
for ( int k = 0; k < e.targetId.birthTime.length(); k++)
bb.put( j++, (byte)e.targetId.birthTime.charAt(k));
bb.putInt( j, e.eventType);
j += 4;
bb.putInt( j, e.object.objid.vid);
j += 4;
bb.putInt( j, e.object.objid.oix);
j += 4;
bb.putInt( j, e.object.offset);
j += 4;
bb.putInt( j, e.object.body);
j += 4;
bb.putInt( j, e.object.size);
j += 4;
bb.putInt( j, e.object.flags);
j += 4;
bb.putInt( j, e.supObject.objid.vid);
j += 4;
bb.putInt( j, e.supObject.objid.oix);
j += 4;
bb.putInt( j, e.supObject.offset);
j += 4;
bb.putInt( j, e.supObject.body);
j += 4;
bb.putInt( j, e.supObject.size);
j += 4;
bb.putInt( j, e.supObject.flags);
j += 4;
bb.putShort( j, (short)e.eventMoreText.length());
j += 2;
for ( int k = 0; k < e.eventMoreText.length(); k++)
bb.put( j++, (byte)e.eventMoreText.charAt(k));
bb.putInt( j, e.syncIdx);
j += 4;
}
out.write( msg);
out.flush();
}
catch(IOException e) {
System.out.println("mhSync: IO exception");
}
break;
}
case MH_ACK: {
try {
MhrsEventId eid = new MhrsEventId(0,null,0);
int i = 6;
eid.nix = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8) + ((value[i+2] & 0xFF) << 16) + ((value[i+3] & 0xFF) << 24);
i += 4;
eid.idx = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8) + ((value[i+2] & 0xFF) << 16) + ((value[i+3] & 0xFF) << 24);
i += 4;
int len = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8);
i += 2;
eid.birthTime = new String( value, i, len);
i += len;
System.out.println("Ack: " + eid.nix + " " + eid.idx);
PwrtStatus psts = mh.outunitAck(eid);
int sts = psts.getSts();
byte[] msg;
msg = new byte[11]; // One extra byte needed for ByteBuffer ??
msg[0] = (byte)130;
msg[1] = (byte)(9);
msg[2] = MH_ACK;
msg[3] = (byte)(id >> 24);
msg[4] = (byte)((id >> 16) & 0xFF);
msg[5] = (byte)((id >> 8) & 0xFF);
msg[6] = (byte)(id & 0xFF);
msg[7] = (byte)(sts >> 24);
msg[8] = (byte)((sts >> 16) & 0xFF);
msg[9] = (byte)((sts >> 8) & 0xFF);
msg[10] = (byte)(sts & 0xFF);
out.write( msg);
out.flush();
}
catch(IOException e) {
System.out.println("mhAck: IO exception");
}
break;
}
default:
System.out.println("Unknown function code received: " + value[0]);
}
......@@ -2211,7 +2816,6 @@ public class GdhWebSocketServer
}
GdhrRefObjectInfo ret = gdh.refObjectInfo(attrName);
System.out.println("gdh.refObjectInfo " + attrName + " type " + ret.typeId);
if(ret.oddSts())
{
sub = new SubElement(maxConnections, threadNumber);
......@@ -2341,6 +2945,74 @@ public class GdhWebSocketServer
return (ArrayList)subscriptions.clone();
}
public synchronized String checkAttrName( String name)
{
String str = name.trim();
int idx;
// Replace $node
for ( int i = 0; i < 4; i++) {
if ( (idx = str.indexOf("$node")) != -1) {
CdhrObjid cdhro = gdh.getNodeObject(0);
String nname = gdh.objidToName(cdhro.objid, Cdh.mName_pathStrict).str;
str = str.substring(0, idx) + nname + str.substring(idx+5);
}
else
break;
}
// Translate reference variable
for ( int i = 0; i < 4; i++) {
if ( (idx = str.indexOf("&(")) != -1) {
String iname = str.substring(idx+2);
int idx2 = iname.indexOf(')');
if ( idx2 != -1) {
String rest = iname.substring( idx2 + 1);
iname = iname.substring( 0, idx2);
CdhrString ret = gdh.getObjectInfoString( iname);
if ( ret.evenSts() || ret.str.equals(""))
return null;
str = str.substring( 0, idx) + ret.str + rest;
}
else
break;
}
else
break;
}
for ( int i = 0; i < 4; i++) {
// Remove attribute before
if ( (idx = str.indexOf(".<")) != -1) {
String rest = str.substring( idx + 2);
int idx2 = str.lastIndexOf( '.', idx - 2);
if ( idx2 != -1)
str = str.substring( 0, idx2) + rest;
else
break;
}
else
break;
}
for ( int i = 0; i < 4; i++) {
// Remove segment name before
if ( (idx = str.indexOf("-<")) != -1) {
String rest = str.substring( idx + 2);
int idx2 = str.lastIndexOf( '-', idx - 2);
if ( idx2 != -1)
str = str.substring( 0, idx2) + rest;
else
break;
}
else
break;
}
return str;
}
}
}
java/jpwr/rt/src/Mh.java
View file @ 0d5bcba0
......@@ -81,7 +81,7 @@ public class Mh
public static final int mh_eEventPrio_D = 64;
public static final int mh_eEventPrio_ = 63;
public static final int mh_eEvent__ = 0;
public static final int mh_eEvent__ = 0;
public static final int mh_eEvent_Ack = 1;
public static final int mh_eEvent_Block = 2;
public static final int mh_eEvent_Cancel = 3;
......@@ -251,13 +251,12 @@ public class Mh
String targetId_birthTime,
int targetId_idx,
int eventType,
PwrtObjid object)
PwrtAttrRef object,
PwrtAttrRef supObject,
String moreText)
{
//System.out.println("Larm " + timeString + " " + messString + " " + nameString + " flags " + flags + " prio " + prio + " sts " +
//status + " nix " + eventId_nix + " birttime " + eventId_birthTime + " idx " + eventId_idx +
//" typ " + eventType);
//hantera det mottagna meddelandet
//System.out.println("messReceived " + eventType);
System.out.println("messReceived " + eventType);
MhrEvent evItem = new MhrEvent(messString,
nameString,
timeString,
......@@ -266,7 +265,7 @@ public class Mh
status,
eventId_nix, eventId_birthTime, eventId_idx,
targetId_nix, targetId_birthTime, targetId_idx,
eventType, object);
eventType, object, supObject, moreText);
lastMhrEvent = evItem;
newAlarmArrived = true;
......
java/jpwr/rt/src/MhData.java
View file @ 0d5bcba0
......@@ -49,6 +49,7 @@ public class MhData
public int maxNrOfEvents;
public Vector<MhrEvent> alarmVec;
public Vector<MhrEvent> eventVec;
public int lastSyncIdx = 0;
public MhData(int maxNrOfAlarms, int maxNrOfEvents)
......@@ -119,6 +120,8 @@ public class MhData
case Mh.mh_eEvent_UserAlarm3:
case Mh.mh_eEvent_UserAlarm4:
// Add to alarm list
lastSyncIdx++;
ev.syncIdx = lastSyncIdx;
this.addMessToVectorInSortedOrder(alarmVec, ev);
// Add copy to event list
this.addMessToVectorInSortedOrder(eventVec, ev.getCopy());
......@@ -146,9 +149,20 @@ public class MhData
if((ev.eventFlags & Mh.mh_mEventFlags_Return) != 0)
{
// Add copy to event list
lastSyncIdx++;
ev.syncIdx = lastSyncIdx;
this.addMessToVectorInSortedOrder(eventVec, ev.getCopy());
}
break;
case Mh.mh_eEvent_Block:
case Mh.mh_eEvent_Reblock:
case Mh.mh_eEvent_Cancel:
case Mh.mh_eEvent_Unblock:
// Add copy to event list
lastSyncIdx++;
ev.syncIdx = lastSyncIdx;
this.addMessToVectorInSortedOrder(eventVec, ev.getCopy());
break;
case Mh.mh_eEvent_Ack:
for(int i = 0; i < alarmVec.size(); i++)
{
......@@ -169,6 +183,8 @@ public class MhData
if((ev.eventFlags & Mh.mh_mEventFlags_Ack) != 0)
{
// Add copy to event list
lastSyncIdx++;
ev.syncIdx = lastSyncIdx;
this.addMessToVectorInSortedOrder(eventVec, ev.getCopy());
}
break;
......@@ -177,6 +193,8 @@ public class MhData
// Add to alarm list
if((ev.eventFlags & Mh.mh_mEventFlags_InfoWindow) != 0)
{
lastSyncIdx++;
ev.syncIdx = lastSyncIdx;
this.addMessToVectorInSortedOrder(alarmVec, ev);
}
// Add copy to event list
......
java/jpwr/rt/src/MhrEvent.java
View file @ 0d5bcba0
......@@ -52,7 +52,10 @@ public class MhrEvent implements Serializable
public MhrsEventId eventId;
public MhrsEventId targetId;
public int eventType;
public PwrtObjid object;
public PwrtAttrRef object;
public PwrtAttrRef supObject;
public String eventMoreText;
public int syncIdx;
public MhrEvent(String eventText,
String eventName,
......@@ -67,7 +70,9 @@ public class MhrEvent implements Serializable
String targetId_birthTime,
int targetId_idx,
int eventType,
PwrtObjid object)
PwrtAttrRef object,
PwrtAttrRef supObject,
String eventMoreText)
{
this.eventText = eventText;
this.eventName = eventName;
......@@ -79,23 +84,29 @@ public class MhrEvent implements Serializable
this.targetId = new MhrsEventId(targetId_nix, targetId_birthTime, targetId_idx);
this.eventType = eventType;
this.object = object;
this.supObject = supObject;
this.eventMoreText = eventMoreText;
}
public MhrEvent getCopy()
{
return new MhrEvent(eventText,
eventName,
eventTime,
eventFlags,
eventPrio,
eventStatus,
eventId.nix,
eventId.birthTime,
eventId.idx,
targetId.nix,
targetId.birthTime,
targetId.idx,
eventType,
object);
MhrEvent ev = new MhrEvent(eventText,
eventName,
eventTime,
eventFlags,
eventPrio,
eventStatus,
eventId.nix,
eventId.birthTime,
eventId.idx,
targetId.nix,
targetId.birthTime,
targetId.idx,
eventType,
object,
supObject,
eventMoreText);
ev.syncIdx = syncIdx;
return ev;
}
public String toString()
{
......
java/jpwr/rt/src/os_templ/hw_templ/makefile
View file @ 0d5bcba0
......@@ -42,12 +42,12 @@ local_java_sources = \
SubElement.java \
GdhServer.java \
GdhServerMonitor.java \
GdhWebSocketServer.java \
HistQuery.java \
MhrsEventId.java \
MhrEvent.java \
Mh.java \
MhData.java \
GdhWebSocketServer.java \
MhServer.java \
Hist.java \
HistServer.java
......
java/jsw/ev/src/ev.html 0 → 100644
View file @ 0d5bcba0
<!DOCTYPE html>
<html>
<head>
<title>Alarm List</title>
<link rel="stylesheet" type="text/css" href="toolbar.css">
</head>
<body>
<div class="toolbar" role="toolbar">
<div id="toolitem1" tabindex="0" class="toolbar-item" role="button"><img src="toolbar_ack.png"><img>....</div>
<div id="toolitem2" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_navigator.png"><img></div>
<div id="toolitem3" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_plc.png"><img>....</div>
<div id="toolitem4" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_graph.png"><img></div>
<div id="toolitem5" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_objectgraph.png"><img></div>
<div id="toolitem6" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_navigator.png"><img></div>
<div id="toolitem7" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_plc.png"><img></div>
<div id="toolitem8" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_history.png"><img></div>
<div id="toolitem9" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_object.png"><img></div>
<div id="toolitem10" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_crossref.png"><img></div>
<div id="toolitem11" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_help.png"><img></div>
<div id="toolitem12" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_classhelp.png"><img></div>
</div>
<!-- <div style="height:300px;overflow:auto;"> -->
<canvas id="flowcanvas" width="1200" height="800"></canvas>
<script src=ev.js></script>
<!-- </div> -->
<hr>
<address><a href="mailto:claes@debian86.ssab.com"></a></address>
</body>
</html>
java/jsw/ev/src/ev.js 0 → 100644
View file @ 0d5bcba0
This source diff could not be displayed because it is too large. You can view the blob instead.
java/jsw/ev/src/os_templ/hw_templ/makefile 0 → 100644
View file @ 0d5bcba0
include $(pwre_dir_symbols)
-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
ifeq ($($(type_name)_generic_mk),)
-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
endif
ifeq ($($(type_name)_generic_mk),)
include $(pwre_kroot)/tools/bld/src/$(type_name)_generic.mk
endif
-include ../../special.mk
-include ../special.mk
-include special.mk
java/jsw/flow/src/flow.js
View file @ 0d5bcba0
This source diff could not be displayed because it is too large. You can view the blob instead.
java/jsw/ge/src/ge.js
View file @ 0d5bcba0
This source diff could not be displayed because it is too large. You can view the blob instead.
java/jsw/opwind/src/opwind.js
View file @ 0d5bcba0
This source diff could not be displayed because it is too large. You can view the blob instead.
java/jsw/xtt/src/xtt.html
View file @ 0d5bcba0
......@@ -8,12 +8,13 @@
<body>
<div class="toolbar" role="toolbar">
<div id="toolitem1" tabindex="0" class="toolbar-item" role="button"><img src="toolbar_graph.png"><img></div>
<div id="toolitem2" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_plc.png"><img></div>
<div id="toolitem3" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_history.png"><img></div>
<div id="toolitem4" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_object.png"><img></div>
<div id="toolitem5" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_crossref.png"><img></div>
<div id="toolitem6" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_help.png"><img></div>
<div id="toolitem7" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_classhelp.png"><img></div>
<div id="toolitem2" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_objectgraph.png"><img></div>
<div id="toolitem3" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_plc.png"><img></div>
<div id="toolitem4" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_history.png"><img></div>
<div id="toolitem5" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_object.png"><img></div>
<div id="toolitem6" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_crossref.png"><img></div>
<div id="toolitem7" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_help.png"><img></div>
<div id="toolitem8" tabindex="-1" class="toolbar-item" role="button"><img src="toolbar_classhelp.png"><img></div>
</div>
<!-- <div style="height:300px;overflow:auto;"> -->
<canvas id="flowcanvas" width="1200" height="800"></canvas>
......
java/jsw/xtt/src/xtt.js
View file @ 0d5bcba0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/lib/rt/src/rt_mh_outunit.c
View file @ 0d5bcba0
......@@ -295,6 +295,12 @@ pwr_tStatus mh_OutunitConnect(
l.pSelEventType = &((pwr_sClass_WebHandler*)p)->EventSelectType;
l.SelectListIsUpdated = NULL;
break;
case pwr_cClass_WebSocketServer:
type = mh_eOutunitType_Operator;
l.pSelL = (void*)&((pwr_sClass_WebSocketServer*)p)->EventSelectList[0];
l.pSelEventType = &((pwr_sClass_WebSocketServer*)p)->EventSelectType;
l.SelectListIsUpdated = NULL;
break;
case pwr_cClass_RttConfig:
type = mh_eOutunitType_Operator;
l.pSelL = (void*)&((pwr_sClass_RttConfig*)p)->EventSelectList[0];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7