Commit ef5f92f0 authored by Adam Wujek's avatar Adam Wujek

optimize strings for wrpc

Try to reuse the same strings to save space in rodata section.

Saves ~350B
Signed-off-by: 's avatarAdam Wujek <adam.wujek@creotech.pl>
parent 8d67c627
......@@ -52,7 +52,7 @@ int wr_calibrated(struct pp_instance *ppi, void *buf, int len, int new_state)
int rms=pp_next_delay_1(ppi, wrTmoIdx);
if ( rms<=(wrp->wrStateRetry*WR_TMO_MS)) {
if ( !rms ) {
pp_diag(ppi, time, 1, "timeout expired: "WR_TMO_NAME"\n");
pp_diag(ppi, time, 1, "timeout expired: %s\n", WR_TMO_NAME);
wr_handshake_fail(ppi);
return 0; /* non-wr already */
}
......
......@@ -27,7 +27,7 @@ int wr_calibration(struct pp_instance *ppi, void *buf, int len, int new_state)
ti = ppi->timestampCorrectionPortDS.egressLatency*1000;
delta->scaledPicoseconds.msb = ti >> 32;
delta->scaledPicoseconds.lsb = ti & 0xFFFFFFFF;
pp_diag(ppi, ext, 1, "deltaTx: msb=0x%x lsb=0x%x\n",
pp_diag(ppi, ext, 1, "%s: msb=0x%x lsb=0x%x\n", "deltaTx",
wrp->deltaTx.scaledPicoseconds.msb,
wrp->deltaTx.scaledPicoseconds.lsb);
fixedDelta_to_pp_time(*delta, &se->delta_txs);/* Update servo specific data */
......@@ -38,7 +38,7 @@ int wr_calibration(struct pp_instance *ppi, void *buf, int len, int new_state)
ppi->timestampCorrectionPortDS.semistaticLatency) * 1000);
delta->scaledPicoseconds.msb = ti >> 32;
delta->scaledPicoseconds.lsb = ti & 0xFFFFFFFF;
pp_diag(ppi, ext, 1, "deltaRx: msb=0x%x lsb=0x%x\n",
pp_diag(ppi, ext, 1, "%s: msb=0x%x lsb=0x%x\n", "deltaRx",
wrp->deltaRx.scaledPicoseconds.msb,
wrp->deltaRx.scaledPicoseconds.lsb);
fixedDelta_to_pp_time(*delta, &se->delta_rxs);/* Update servo specific data */
......
......@@ -45,7 +45,7 @@ int wr_locked(struct pp_instance *ppi, void *buf, int len, int new_state)
int rms=pp_next_delay_1(ppi, wrTmoIdx);
if ( rms<=(wrp->wrStateRetry*WR_TMO_MS)) {
if ( !rms ) {
pp_diag(ppi, time, 1, "timeout expired: "WR_TMO_NAME"\n");
pp_diag(ppi, time, 1, "timeout expired: %s\n", WR_TMO_NAME);
wr_handshake_fail(ppi);
return 0; /* non-wr already */
}
......
......@@ -45,7 +45,7 @@ int wr_m_lock(struct pp_instance *ppi, void *buf, int len, int new_state)
int rms=pp_next_delay_1(ppi, wrTmoIdx);
if ( rms<=(wrp->wrStateRetry*WR_TMO_MS)) {
if ( !rms ) {
pp_diag(ppi, time, 1, "timeout expired: "WR_TMO_NAME"\n");
pp_diag(ppi, time, 1, "timeout expired: %s\n", WR_TMO_NAME);
wr_handshake_fail(ppi);
return 0; /* non-wr already */
}
......
......@@ -47,7 +47,7 @@ int wr_present(struct pp_instance *ppi, void *buf, int len, int new_state)
int rms=pp_next_delay_1(ppi, wrTmoIdx);
if (rms<=(wrp->wrStateRetry*WR_TMO_MS)) {
if (!rms) {
pp_diag(ppi, time, 1, "timeout expired: "WR_TMO_NAME"\n");
pp_diag(ppi, time, 1, "timeout expired: %s\n", WR_TMO_NAME);
wr_handshake_fail(ppi);
return 0; /* non-wr already */
}
......
......@@ -47,7 +47,7 @@ int wr_resp_calib_req(struct pp_instance *ppi, void *buf, int len, int new_state
int rms=pp_next_delay_1(ppi, wrTmoIdx);
if ( rms<=(wrp->wrStateRetry*WR_TMO_MS)) {
if ( !rms ) {
pp_diag(ppi, time, 1, "timeout expired: "WR_TMO_NAME"\n");
pp_diag(ppi, time, 1, "timeout expired: %s\n", WR_TMO_NAME);
wr_handshake_fail(ppi);
return 0; /* non-wr already */
}
......
......@@ -33,7 +33,7 @@ int wr_s_lock(struct pp_instance *ppi, void *buf, int len, int new_state)
if ( rms<=(wrp->wrStateRetry*WR_TMO_MS)) {
WRH_OPER()->locking_disable(ppi);
if ( rms==0 ) {
pp_diag(ppi, time, 1, "timeout expired: "WR_TMO_NAME"\n");
pp_diag(ppi, time, 1, "timeout expired: %s\n", WR_TMO_NAME);
wr_handshake_fail(ppi);
return 0; /* non-wr already */
}
......
......@@ -208,26 +208,30 @@ int msg_unpack_wrsig(struct pp_instance *ppi, void *buf,
tlv_versionNumber = 0xFF & ntohs(*(UInteger16 *)(buf + 52));
if (tlv_type != TLV_TYPE_ORG_EXTENSION) {
pp_diag(ppi, frames, 1, "handle Signaling msg, failed, This is not "
"organization extension TLV = 0x%x\n", tlv_type);
/* "handle Signaling msg, failed, not organization extension TLV = 0x%x\n" */
pp_diag(ppi, frames, 1, "%sorganization extension TLV = 0x%x\n",
"handle Signaling msg, failed, not ", tlv_type);
return 0;
}
if (tlv_organizationID != WR_TLV_ORGANIZATION_ID) {
pp_diag(ppi, frames, 1, "handle Signaling msg, failed, not CERN's "
"OUI = 0x%x\n", tlv_organizationID);
/* "handle Signaling msg, failed, not CERN's OUI = 0x%x\n" */
pp_diag(ppi, frames, 1, "%sCERN's OUI = 0x%x\n",
"handle Signaling msg, failed, not ", tlv_organizationID);
return 0;
}
if (tlv_magicNumber != WR_TLV_MAGIC_NUMBER) {
pp_diag(ppi, frames, 1, "handle Signaling msg, failed, "
"not White Rabbit magic number = 0x%x\n", tlv_magicNumber);
/* "handle Signaling msg, failed, not White Rabbit magic number = 0x%x\n" */
pp_diag(ppi, frames, 1, "%sWhite Rabbit magic number = 0x%x\n",
"handle Signaling msg, failed, not ", tlv_magicNumber);
return 0;
}
if (tlv_versionNumber != WR_TLV_WR_VERSION_NUMBER ) {
pp_diag(ppi, frames, 1, "handle Signaling msg, failed, not supported "
"version number = 0x%x\n", tlv_versionNumber);
/* "handle Signaling msg, failed, not supported version number = 0x%x\n" */
pp_diag(ppi, frames, 1, "%ssupported version number = 0x%x\n",
"handle Signaling msg, failed, not ", tlv_versionNumber);
return 0;
}
......
......@@ -151,8 +151,9 @@ void bmc_s1(struct pp_instance *ppi,
if (prop->ptpTimescale) {
ret = TOPS(ppi)->get_utc_time(ppi, &hours, &minutes, &seconds);
if (ret) {
/* "Could not get UTC time from system, taking received flags\n"; */
pp_diag(ppi, bmc, 1,
"Could not get UTC time from system, taking received flags\n");
"Could not get UTC %s from system, taking received flags\n", "time");
prop->leap59 = ((frgn_master->flagField[1] & FFB_LI59) != 0);
prop->leap61 = ((frgn_master->flagField[1] & FFB_LI61) != 0);
prop->currentUtcOffset = frgn_master->currentUtcOffset;
......@@ -178,8 +179,9 @@ void bmc_s1(struct pp_instance *ppi,
} else {
ret = TOPS(ppi)->get_utc_offset(ppi, &offset, &leap59, &leap61);
if (ret) {
/* "Could not get UTC flags from system, taking received flags\n" */
pp_diag(ppi, bmc, 1,
"Could not get UTC flags from system, taking received flags\n");
"Could not get UTC %s from system, taking received flags\n", "flags");
prop->leap59 = ((frgn_master->flagField[1] & FFB_LI59) != 0);
prop->leap61 = ((frgn_master->flagField[1] & FFB_LI61) != 0);
prop->currentUtcOffset = frgn_master->currentUtcOffset;
......@@ -370,21 +372,21 @@ static int are_qualified(struct pp_instance *ppi,
/* if B is not qualified 9.3.2.5 c) & 9.3.2.3 a) & b)*/
if ( a_is_qualified && !b_is_qualified ) {
pp_diag(ppi, bmc, 2, "Dataset B not qualified\n");
pp_diag(ppi, bmc, 2, "Dataset %s not qualified\n", "B");
*ret=-1;
return 0;
}
/* if A is not qualified 9.3.2.5 c) & 9.3.2.3 a) & b) */
if (b_is_qualified && !a_is_qualified) {
pp_diag(ppi, bmc, 2, "Dataset A not qualified\n");
pp_diag(ppi, bmc, 2, "Dataset %s not qualified\n", "A");
*ret= 1;
return 0;
}
/* if both are not qualified 9.3.2.5 c) & 9.3.2.3 a) & b) */
if ( !a_is_qualified && !b_is_qualified ) {
pp_diag(ppi, bmc, 2, "Dataset A & B not qualified\n");
pp_diag(ppi, bmc, 2, "Dataset %s not qualified\n", "A & B");
*ret= 0;
return 0;
}
......@@ -410,33 +412,43 @@ static int bmc_gm_cmp(struct pp_instance *ppi,
}
if (a->grandmasterPriority1 != b->grandmasterPriority1) {
pp_diag(ppi, bmc, 3, "Priority1 A: %i, Priority1 B: %i\n",
a->grandmasterPriority1, b->grandmasterPriority1);
/* "Priority1 A: %i, Priority1 B: %i\n", */
pp_diag(ppi, bmc, 3, "%s A: %i, %s B: %i\n",
"Priority1", a->grandmasterPriority1,
"Priority1", b->grandmasterPriority1);
return a->grandmasterPriority1 - b->grandmasterPriority1;
}
if (qa->clockClass != qb->clockClass) {
pp_diag(ppi, bmc, 3, "ClockClass A: %i, ClockClass B: %i\n",
qa->clockClass, qb->clockClass);
/* "ClockClass A: %i, ClockClass B: %i\n", */
pp_diag(ppi, bmc, 3, "%s A: %i, %s B: %i\n",
"ClockClass", qa->clockClass,
"ClockClass", qb->clockClass);
return qa->clockClass - qb->clockClass;
}
if (qa->clockAccuracy != qb->clockAccuracy) {
pp_diag(ppi, bmc, 3, "ClockAccuracy A: %i, ClockAccuracy B: %i\n",
qa->clockAccuracy, qb->clockAccuracy);
/* "ClockAccuracy A: %i, ClockAccuracy B: %i\n", */
pp_diag(ppi, bmc, 3, "%s A: %i, %s B: %i\n",
"ClockAccuracy", qa->clockAccuracy,
"ClockAccuracy", qb->clockAccuracy);
return qa->clockAccuracy - qb->clockAccuracy;
}
if (qa->offsetScaledLogVariance != qb->offsetScaledLogVariance) {
pp_diag(ppi, bmc, 3, "Variance A: %i, Variance B: %i\n",
qa->offsetScaledLogVariance, qb->offsetScaledLogVariance);
/* "Variance A: %i, Variance B: %i\n", */
pp_diag(ppi, bmc, 3, "%s A: %i, %s B: %i\n",
"Variance", qa->offsetScaledLogVariance,
"Variance", qb->offsetScaledLogVariance);
return qa->offsetScaledLogVariance
- qb->offsetScaledLogVariance;
}
if (a->grandmasterPriority2 != b->grandmasterPriority2) {
pp_diag(ppi, bmc, 3, "Priority2 A: %i, Priority2 B: %i\n",
a->grandmasterPriority2, b->grandmasterPriority2);
/* "Priority2 A: %i, Priority2 B: %i\n", */
pp_diag(ppi, bmc, 3, "%s A: %i, %s B: %i\n",
"Priority2", a->grandmasterPriority2,
"Priority2", b->grandmasterPriority2);
return a->grandmasterPriority2 - b->grandmasterPriority2;
}
......@@ -869,7 +881,7 @@ struct pp_frgn_master * bmc_add_frgn_master(struct pp_instance *ppi, struct pp_
*/
if (!bmc_idcmp(&pid->clockIdentity, &DSDEF(ppi)->clockIdentity) &&
pid->portNumber==ppi->port_idx) {
pp_diag(ppi, bmc, 2, "Announce frame from same port\n");
pp_diag(ppi, bmc, 2, "Announce frame from %s\n", "same port");
return NULL;
}
sel = 0;
......@@ -893,19 +905,19 @@ struct pp_frgn_master * bmc_add_frgn_master(struct pp_instance *ppi, struct pp_
&DSDEF(ppi)->clockIdentity)) {
cmpres = bmc_pidcmp(pid, &DSPOR(ppi)->portIdentity);
pp_diag(ppi, bmc, 2, "Announce frame from this clock\n");
pp_diag(ppi, bmc, 2, "Announce frame from %s\n", "this clock");
if (cmpres < 0) {
pp_diag(ppi, bmc, 2, "Announce frame from a better port on this clock\n");
pp_diag(ppi, bmc, 2, "Announce frame from %s\n", "a better port on this clock");
bmc_p1(ppi);
ppi->next_state = PPS_PASSIVE;
/* as long as we receive that reset the announce timeout */
pp_timeout_reset(ppi, PP_TO_ANN_RECEIPT);
} else if (cmpres > 0) {
pp_diag(ppi, bmc, 2, "Announce frame from a worse port on this clock\n");
pp_diag(ppi, bmc, 2, "Announce frame from %s\n", "a worse port on this clock");
return NULL;
} else {
pp_diag(ppi, bmc, 2, "Announce frame from this port\n");
pp_diag(ppi, bmc, 2, "Announce frame from %s\n", "this port");
return NULL;
}
}
......@@ -913,7 +925,7 @@ struct pp_frgn_master * bmc_add_frgn_master(struct pp_instance *ppi, struct pp_
/* Check if announce from a port from this clock 9.3.2.5 a) */
if (!bmc_idcmp(&pid->clockIdentity,
&DSDEF(ppi)->clockIdentity)) {
pp_diag(ppi, bmc, 2, "Announce frame from this clock\n");
pp_diag(ppi, bmc, 2, "Announce frame from %s\n", "this clock");
return NULL;
}
}
......@@ -921,7 +933,7 @@ struct pp_frgn_master * bmc_add_frgn_master(struct pp_instance *ppi, struct pp_
/* Check if announce has steps removed larger than 255 9.3.2.5 d) */
if (frgn_master->stepsRemoved >= 255) {
pp_diag(ppi, bmc, 2, "Announce frame steps removed"
"larger or equal 255: %i\n",
" larger or equal 255: %i\n",
frgn_master->stepsRemoved);
return NULL;
}
......@@ -1058,7 +1070,7 @@ static void bmc_remove_foreign_master(struct pp_instance *ppi, int frg_master_id
void bmc_flush_erbest(struct pp_instance *ppi)
{
if ( ppi->frgn_rec_best!=-1 && ppi->frgn_rec_best<ppi->frgn_rec_num ) {
pp_diag(ppi, bmc, 1, "Aged out ErBest foreign master %i/%i\n",
pp_diag(ppi, bmc, 1, "Aged out %sforeign master %i/%i\n", "ErBest ",
ppi->frgn_rec_best, ppi->frgn_rec_num);
bmc_remove_foreign_master(ppi,ppi->frgn_rec_best);
}
......@@ -1079,7 +1091,7 @@ static void bmc_age_frgn_master(struct pp_instance *ppi)
if ( !is_ebest(GLBS(ppi),frgn_master) ) {
if ( (UInteger32)(now-frgn_master->lastAnnounceMsgMs)> ppi->frgn_master_time_window_ms ) {
// Remove age out
pp_diag(ppi, bmc, 1, "Aged out foreign master %i/%i\n",
pp_diag(ppi, bmc, 1, "Aged out %sforeign master %i/%i\n", "",
i, ppi->frgn_rec_num);
bmc_remove_foreign_master(ppi,i);
continue;
......
......@@ -96,8 +96,9 @@ int pp_lib_may_issue_announce(struct pp_instance *ppi)
if (prop->ptpTimescale) {
ret = TOPS(ppi)->get_utc_time(ppi, &hours, &minutes, &seconds);
if (ret) {
/* "Could not get UTC time from system, taking received flags\n" */
pp_diag(ppi, frames, 1,
"Could not get UTC time from system, taking received flags\n");
"Could not get UTC %s from system, taking received flags\n", "time");
} else {
/* for 2 announce intervals after midnight, get the offset from the system */
if ((hours == 00) && (minutes == 00) &&
......
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