Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 949 → Rev 950

/shark/trunk/ports/first/fsf_include/tests/synch_obj_test/fsf_synch_obj_test.c
97,7 → 97,7
char *s = NULL;
int i;
 
printf("\n");
fsf_printf("\n");
for (i=0;i<res_index;i++)
{
now = res[i].t;
106,10 → 106,10
diff = now;
decr_timespec(&diff, &last_time);
last_time = now;
printf("(%2d)", i+1);
printf("%-60s", s);
printf(" %2d %9d", now.tv_sec,now.tv_nsec);
printf(" [diff=%13.9f]\n", (double)diff.tv_sec+((double)diff.tv_nsec/(double)1000000000));
fsf_printf("(%2d)", i+1);
fsf_printf("%-60s", s);
fsf_printf(" %2d %9d", now.tv_sec,now.tv_nsec);
fsf_printf(" [diff=%13.9f]\n", (double)diff.tv_sec+((double)diff.tv_nsec/(double)1000000000));
}
 
return 0;
221,8 → 221,7
 
pthread_t task_in_b;
 
calibrate_cycle();
fsf_init();
INITIALIZATION_CODE
SERIAL_CONSOLE_INIT;
param.sched_priority = main_priority;
242,7 → 241,7
 
if ((terror=fsf_initialize_contract(&contract)))
{
printf(" Initialize fail for server A\n");
fsf_printf(" Initialize fail for server A\n");
ERROR(terror,"fsf_initialize_contract failed");
}
 
251,7 → 250,7
&period_max,
workload)))
{
printf("Set_Basic_Parameters failed for server A\n");
fsf_printf("Set_Basic_Parameters failed for server A\n");
ERROR(terror,"set_contract_basic_parameters failed");
}
 
263,7 → 262,7
deadline_miss_sig_notify,
deadline_miss_sig_value)))
{
printf("Set_Timing_Requirements failed for server A\n");
fsf_printf("Set_Timing_Requirements failed for server A\n");
ERROR(terror,"fsf_set_contract_timing_requirements failed");
}
 
275,7 → 274,7
quality,
importance)))
{
printf("Set_Reclamation_Parameters failed for server A\n");
fsf_printf("Set_Reclamation_Parameters failed for server A\n");
ERROR(terror,"fsf_set_contract_reclamation_parameters failed");
}
 
283,7 → 282,7
if ((terror=fsf_set_contract_synchronization_parameters (&contract,
critical_sections)))
{
printf("Set_Synchronization_Parameters failed for server A\n");
fsf_printf("Set_Synchronization_Parameters failed for server A\n");
ERROR(terror,"fsf_set_contract_synchronization_parameters failed");
}
 
293,7 → 292,7
put_time(NULL, "A end first server contract negotiation");
if (terror)
{
printf("Negotiate_Contract failed for server A\n");
fsf_printf("Negotiate_Contract failed for server A\n");
ERROR(terror,"fsf_negotiate_contract_for_myself failed");
}
 
317,7 → 316,7
&period_max,
workload)))
{
printf("Set_Basic_Parameters failed for server B\n");
fsf_printf("Set_Basic_Parameters failed for server B\n");
ERROR(terror,"set_contract_basic_parameters failed");
}
 
329,7 → 328,7
deadline_miss_sig_notify,
deadline_miss_sig_value)))
{
printf("Set_Timing_Requirements failed for server B\n");
fsf_printf("Set_Timing_Requirements failed for server B\n");
ERROR(terror,"fsf_set_contract_timing_requirements failed");
}
 
337,7 → 336,7
if ((terror=fsf_set_contract_synchronization_parameters (&contract,
critical_sections)))
{
printf("Set_Synchronization_Parameters failed for server B\n");
fsf_printf("Set_Synchronization_Parameters failed for server B\n");
ERROR(terror,"fsf_set_contract_synchronization_parameters failed");
}
 
346,7 → 345,7
put_time(NULL, "A ends server B contract negotiation");
if (terror)
{
printf("Negotiate_Contract failed for server B\n");
fsf_printf("Negotiate_Contract failed for server B\n");
ERROR(terror,"fsf_negotiate_contract_for_new_thread failed");
}
 
401,7 → 400,7
 
//print_time_results();
 
printf("\nThe End.\n");
fsf_printf("\nThe End.\n");
 
//stop_scheduler = 1;
 
/shark/trunk/ports/first/fsf_include/tests/synch_obj_test/makefile
15,5 → 15,5
endif
 
$(OS)_$(WL)_synch_test:
make -f $(SUBMAKE) APPNAME=$(PROGS) APP=fsf_synch_obj_test INIT= OTHEROBJS="../$(OSNAME)/initfile.o ../$(OSNAME)/shark.o" OTHERINCL="-I../common" SHARKOPT="__INPUT__ __FIRST__ __NEW_TRACER__ __LINUXC26__ __PCI__ __NET__ __GRX__"
make -f $(SUBMAKE) APPNAME=$(PROGS) APP=fsf_synch_obj_test INIT= OTHEROBJS="../$(OSNAME)/initfile.o ../$(OSNAME)/shark.o ../$(OSNAME)/net_print.o" OTHERINCL="-I../common" SHARKOPT="__INPUT__ __FIRST__ __NEW_TRACER__ __LINUXC26__ __PCI__ __NET__ __GRX__"