Changeset 43012
- Timestamp:
- May 4, 2026, 11:09:40 AM (2 days ago)
- Location:
- branches/eam_branches/ipp-pstamp-20260421/Ohana/src
- Files:
-
- 23 edited
-
addstar/src/loadICRF_remote_hosts.c (modified) (2 diffs)
-
addstar/src/loadstarpar_remote_hosts.c (modified) (2 diffs)
-
addstar/src/setobjflags_remote_hosts.c (modified) (2 diffs)
-
dvopsps/src/insert_FGshape_dvopsps_catalog.c (modified) (4 diffs)
-
dvopsps/src/insert_FWobjects_dvopsps_catalog.c (modified) (6 diffs)
-
dvopsps/src/insert_detections_dvopsps_catalog.c (modified) (1 diff)
-
dvopsps/src/insert_diffobj_dvopsps_catalog.c (modified) (4 diffs)
-
dvopsps/src/insert_objects_dvopsps_catalog.c (modified) (4 diffs)
-
dvopsps/src/insert_skytable.c (modified) (1 diff)
-
fakeastro/src/remote_hosts.c (modified) (2 diffs)
-
libdvo/src/HostTable.c (modified) (8 diffs)
-
libdvo/src/RegionHostTable.c (modified) (4 diffs)
-
libohana/include/ohana.h (modified) (1 diff)
-
opihi/pantasks/CheckJobs.c (modified) (1 diff)
-
opihi/pantasks/CheckTasks.c (modified) (1 diff)
-
opihi/pantasks/JobOps.c (modified) (1 diff)
-
opihi/pantasks/ListenClients.c (modified) (1 diff)
-
opihi/pantasks/LocalJob.c (modified) (3 diffs)
-
opihi/pantasks/controller_check.c (modified) (1 diff)
-
opihi/pclient/status.c (modified) (1 diff)
-
opihi/pcontrol/GetJobOutput.c (modified) (2 diffs)
-
photdbc/src/PclientCommands.c (modified) (2 diffs)
-
tools/src/fits_to_mysql.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/eam_branches/ipp-pstamp-20260421/Ohana/src/addstar/src/loadICRF_remote_hosts.c
r37807 r43012 100 100 EmptyIOBuffer (&host->stdout, 100, host->stdio[HOST_STDOUT]); 101 101 printHead = VERBOSE || (host->stdout.Nbuffer > 0); 102 if (printHead) fprintf (stdout, "--- stdout from %s --- (% dbytes, v2)\n", host->hostname, host->stdout.Nbuffer);102 if (printHead) fprintf (stdout, "--- stdout from %s --- (%lu bytes, v2)\n", host->hostname, host->stdout.Nbuffer); 103 103 Nout = write (STDOUT_FILENO, host->stdout.buffer, host->stdout.Nbuffer); 104 104 if (Nout != host->stdout.Nbuffer) { fprintf (stderr, "(error writing log?)\n"); } … … 109 109 EmptyIOBuffer (&host->stderr, 100, host->stdio[HOST_STDERR]); 110 110 printHead = VERBOSE || (host->stderr.Nbuffer > 0); 111 if (printHead) fprintf (stdout, "--- stderr from %s --- (% dbytes, v2)\n", host->hostname, host->stderr.Nbuffer);111 if (printHead) fprintf (stdout, "--- stderr from %s --- (%lu bytes, v2)\n", host->hostname, host->stderr.Nbuffer); 112 112 Nout = write (STDOUT_FILENO, host->stderr.buffer, host->stderr.Nbuffer); 113 113 if (Nout != host->stderr.Nbuffer) { fprintf (stderr, "(error writing log?)\n"); } -
branches/eam_branches/ipp-pstamp-20260421/Ohana/src/addstar/src/loadstarpar_remote_hosts.c
r39330 r43012 103 103 EmptyIOBuffer (&host->stdout, 100, host->stdio[HOST_STDOUT]); 104 104 printHead = VERBOSE || (host->stdout.Nbuffer > 0); 105 if (printHead) fprintf (stdout, "--- stdout from %s --- (% dbytes, v2)\n", host->hostname, host->stdout.Nbuffer);106 Nout = write (STDOUT_FILENO, host->stdout.buffer, host->stdout.Nbuffer);105 if (printHead) fprintf (stdout, "--- stdout from %s --- (%lu bytes, v2)\n", host->hostname, host->stdout.Nbuffer); 106 Nout = write (STDOUT_FILENO, host->stdout.buffer, (size_t) host->stdout.Nbuffer); 107 107 if (Nout != host->stdout.Nbuffer) { fprintf (stderr, "(error writing log?)\n"); } 108 108 FlushIOBuffer (&host->stdout); … … 112 112 EmptyIOBuffer (&host->stderr, 100, host->stdio[HOST_STDERR]); 113 113 printHead = VERBOSE || (host->stderr.Nbuffer > 0); 114 if (printHead) fprintf (stdout, "--- stderr from %s --- (% dbytes, v2)\n", host->hostname, host->stderr.Nbuffer);114 if (printHead) fprintf (stdout, "--- stderr from %s --- (%lu bytes, v2)\n", host->hostname, host->stderr.Nbuffer); 115 115 Nout = write (STDOUT_FILENO, host->stderr.buffer, host->stderr.Nbuffer); 116 116 if (Nout != host->stderr.Nbuffer) { fprintf (stderr, "(error writing log?)\n"); } -
branches/eam_branches/ipp-pstamp-20260421/Ohana/src/addstar/src/setobjflags_remote_hosts.c
r39535 r43012 114 114 EmptyIOBuffer (&host->stdout, 100, host->stdio[HOST_STDOUT]); 115 115 printHead = VERBOSE || (host->stdout.Nbuffer > 0); 116 if (printHead) fprintf (stdout, "--- stdout from %s --- (% dbytes, v2)\n", host->hostname, host->stdout.Nbuffer);116 if (printHead) fprintf (stdout, "--- stdout from %s --- (%lu bytes, v2)\n", host->hostname, host->stdout.Nbuffer); 117 117 Nout = write (STDOUT_FILENO, host->stdout.buffer, host->stdout.Nbuffer); 118 118 if (Nout != host->stdout.Nbuffer) { fprintf (stderr, "(error writing log?)\n"); } … … 123 123 EmptyIOBuffer (&host->stderr, 100, host->stdio[HOST_STDERR]); 124 124 printHead = VERBOSE || (host->stderr.Nbuffer > 0); 125 if (printHead) fprintf (stdout, "--- stderr from %s --- (% dbytes, v2)\n", host->hostname, host->stderr.Nbuffer);125 if (printHead) fprintf (stdout, "--- stderr from %s --- (%lu bytes, v2)\n", host->hostname, host->stderr.Nbuffer); 126 126 Nout = write (STDOUT_FILENO, host->stderr.buffer, host->stderr.Nbuffer); 127 127 if (Nout != host->stderr.Nbuffer) { fprintf (stderr, "(error writing log?)\n"); } -
branches/eam_branches/ipp-pstamp-20260421/Ohana/src/dvopsps/src/insert_FGshape_dvopsps_catalog.c
r39593 r43012 121 121 fprintf (stderr, "failed to create table:\n"); 122 122 fprintf (stderr, "%s\n", mysql_error(mysql)); 123 fprintf (stderr, "Nbuffer: % d\n", buffer.Nbuffer);123 fprintf (stderr, "Nbuffer: %lu\n", buffer.Nbuffer); 124 124 } 125 125 buffer.Nbuffer = 0; … … 164 164 fprintf (stderr, "failed to create table:\n"); 165 165 fprintf (stderr, "%s\n", mysql_error(mysql)); 166 fprintf (stderr, "Nbuffer: % d\n", buffer.Nbuffer);166 fprintf (stderr, "Nbuffer: %lu\n", buffer.Nbuffer); 167 167 } 168 168 … … 297 297 fprintf (stderr, "error with insert:\n"); 298 298 fprintf (stderr, "%s\n", mysql_error(mysql)); 299 fprintf (stderr, "Nbuffer: % d\n", ave_buffer->Nbuffer);299 fprintf (stderr, "Nbuffer: %lu\n", ave_buffer->Nbuffer); 300 300 } 301 301 result = mysql_store_result (mysql); … … 307 307 fprintf (stderr, "error with insert:\n"); 308 308 fprintf (stderr, "%s\n", mysql_error(mysql)); 309 fprintf (stderr, "Nbuffer: % d\n", gal_buffer->Nbuffer);309 fprintf (stderr, "Nbuffer: %lu\n", gal_buffer->Nbuffer); 310 310 } 311 311 result = mysql_store_result (mysql); -
branches/eam_branches/ipp-pstamp-20260421/Ohana/src/dvopsps/src/insert_FWobjects_dvopsps_catalog.c
r40291 r43012 135 135 fprintf (stderr, "failed to create table:\n"); 136 136 fprintf (stderr, "%s\n", mysql_error(mysql)); 137 fprintf (stderr, "Nbuffer: % d\n", buffer.Nbuffer);137 fprintf (stderr, "Nbuffer: %lu\n", buffer.Nbuffer); 138 138 } 139 139 buffer.Nbuffer = 0; … … 181 181 fprintf (stderr, "failed to create table:\n"); 182 182 fprintf (stderr, "%s\n", mysql_error(mysql)); 183 fprintf (stderr, "Nbuffer: % d\n", buffer.Nbuffer);183 fprintf (stderr, "Nbuffer: %lu\n", buffer.Nbuffer); 184 184 } 185 185 buffer.Nbuffer = 0; … … 255 255 fprintf (stderr, "failed to create table:\n"); 256 256 fprintf (stderr, "%s\n", mysql_error(mysql)); 257 fprintf (stderr, "Nbuffer: % d\n", buffer.Nbuffer);257 fprintf (stderr, "Nbuffer: %lu\n", buffer.Nbuffer); 258 258 } 259 259 … … 566 566 fprintf (stderr, "error with insert:\n"); 567 567 fprintf (stderr, "%s\n", mysql_error(mysql)); 568 fprintf (stderr, "Nbuffer: % d\n", ave_buffer->Nbuffer);568 fprintf (stderr, "Nbuffer: %lu\n", ave_buffer->Nbuffer); 569 569 } 570 570 result = mysql_store_result (mysql); … … 576 576 fprintf (stderr, "error with insert:\n"); 577 577 fprintf (stderr, "%s\n", mysql_error(mysql)); 578 fprintf (stderr, "Nbuffer: % d\n", sec_buffer->Nbuffer);578 fprintf (stderr, "Nbuffer: %lu\n", sec_buffer->Nbuffer); 579 579 } 580 580 result = mysql_store_result (mysql); … … 586 586 fprintf (stderr, "error with insert:\n"); 587 587 fprintf (stderr, "%s\n", mysql_error(mysql)); 588 fprintf (stderr, "Nbuffer: % d\n", cpy_buffer->Nbuffer);588 fprintf (stderr, "Nbuffer: %lu\n", cpy_buffer->Nbuffer); 589 589 } 590 590 result = mysql_store_result (mysql); -
branches/eam_branches/ipp-pstamp-20260421/Ohana/src/dvopsps/src/insert_detections_dvopsps_catalog.c
r40295 r43012 223 223 fprintf (stderr, "error with insert:\n"); 224 224 fprintf (stderr, "%s\n", mysql_error(mysql)); 225 fprintf (stderr, "Nbuffer: % d\n", buffer->Nbuffer);225 fprintf (stderr, "Nbuffer: %lu\n", buffer->Nbuffer); 226 226 if (DEBUG) { 227 227 FILE *f = fopen ("dvopsps.dump.sql", "w"); -
branches/eam_branches/ipp-pstamp-20260421/Ohana/src/dvopsps/src/insert_diffobj_dvopsps_catalog.c
r39275 r43012 107 107 fprintf (stderr, "failed to create table:\n"); 108 108 fprintf (stderr, "%s\n", mysql_error(mysql)); 109 fprintf (stderr, "Nbuffer: % d\n", buffer.Nbuffer);109 fprintf (stderr, "Nbuffer: %lu\n", buffer.Nbuffer); 110 110 } 111 111 buffer.Nbuffer = 0; … … 148 148 fprintf (stderr, "failed to create table:\n"); 149 149 fprintf (stderr, "%s\n", mysql_error(mysql)); 150 fprintf (stderr, "Nbuffer: % d\n", buffer.Nbuffer);150 fprintf (stderr, "Nbuffer: %lu\n", buffer.Nbuffer); 151 151 } 152 152 // result = mysql_store_result (mysql); … … 362 362 fprintf (stderr, "error with insert:\n"); 363 363 fprintf (stderr, "%s\n", mysql_error(mysql)); 364 fprintf (stderr, "Nbuffer: % d\n", ave_buffer->Nbuffer);364 fprintf (stderr, "Nbuffer: %lu\n", ave_buffer->Nbuffer); 365 365 } 366 366 result = mysql_store_result (mysql); … … 372 372 fprintf (stderr, "error with insert:\n"); 373 373 fprintf (stderr, "%s\n", mysql_error(mysql)); 374 fprintf (stderr, "Nbuffer: % d\n", sec_buffer->Nbuffer);374 fprintf (stderr, "Nbuffer: %lu\n", sec_buffer->Nbuffer); 375 375 } 376 376 result = mysql_store_result (mysql); -
branches/eam_branches/ipp-pstamp-20260421/Ohana/src/dvopsps/src/insert_objects_dvopsps_catalog.c
r40291 r43012 147 147 fprintf (stderr, "failed to create table:\n"); 148 148 fprintf (stderr, "%s\n", mysql_error(mysql)); 149 fprintf (stderr, "Nbuffer: % d\n", buffer.Nbuffer);149 fprintf (stderr, "Nbuffer: %lu\n", buffer.Nbuffer); 150 150 } 151 151 // result = mysql_store_result (mysql); … … 190 190 fprintf (stderr, "failed to create table:\n"); 191 191 fprintf (stderr, "%s\n", mysql_error(mysql)); 192 fprintf (stderr, "Nbuffer: % d\n", buffer.Nbuffer);192 fprintf (stderr, "Nbuffer: %lu\n", buffer.Nbuffer); 193 193 } 194 194 // result = mysql_store_result (mysql); … … 403 403 fprintf (stderr, "error with insert:\n"); 404 404 fprintf (stderr, "%s\n", mysql_error(mysql)); 405 fprintf (stderr, "Nbuffer: % d\n", ave_buffer->Nbuffer);405 fprintf (stderr, "Nbuffer: %lu\n", ave_buffer->Nbuffer); 406 406 } 407 407 result = mysql_store_result (mysql); … … 413 413 fprintf (stderr, "error with insert:\n"); 414 414 fprintf (stderr, "%s\n", mysql_error(mysql)); 415 fprintf (stderr, "Nbuffer: % d\n", sec_buffer->Nbuffer);415 fprintf (stderr, "Nbuffer: %lu\n", sec_buffer->Nbuffer); 416 416 } 417 417 result = mysql_store_result (mysql); -
branches/eam_branches/ipp-pstamp-20260421/Ohana/src/dvopsps/src/insert_skytable.c
r38851 r43012 101 101 fprintf (stderr, "error with insert:\n"); 102 102 fprintf (stderr, "%s\n", mysql_error(mysql)); 103 fprintf (stderr, "Nbuffer: % d\n", buffer->Nbuffer);103 fprintf (stderr, "Nbuffer: %lu\n", buffer->Nbuffer); 104 104 } 105 105 result = mysql_store_result (mysql); -
branches/eam_branches/ipp-pstamp-20260421/Ohana/src/fakeastro/src/remote_hosts.c
r37807 r43012 97 97 EmptyIOBuffer (&host->stdout, 100, host->stdio[HOST_STDOUT]); 98 98 printHead = VERBOSE || (host->stdout.Nbuffer > 0); 99 if (printHead) fprintf (stdout, "--- stdout from %s --- (% dbytes, v2)\n", host->hostname, host->stdout.Nbuffer);99 if (printHead) fprintf (stdout, "--- stdout from %s --- (%lu bytes, v2)\n", host->hostname, host->stdout.Nbuffer); 100 100 Nout = write (STDOUT_FILENO, host->stdout.buffer, host->stdout.Nbuffer); 101 101 if (Nout != host->stdout.Nbuffer) { fprintf (stderr, "(error writing log?)\n"); } … … 106 106 EmptyIOBuffer (&host->stderr, 100, host->stdio[HOST_STDERR]); 107 107 printHead = VERBOSE || (host->stderr.Nbuffer > 0); 108 if (printHead) fprintf (stdout, "--- stderr from %s --- (% dbytes, v2)\n", host->hostname, host->stderr.Nbuffer);108 if (printHead) fprintf (stdout, "--- stderr from %s --- (%lu bytes, v2)\n", host->hostname, host->stderr.Nbuffer); 109 109 Nout = write (STDOUT_FILENO, host->stderr.buffer, host->stderr.Nbuffer); 110 110 if (Nout != host->stderr.Nbuffer) { fprintf (stderr, "(error writing log?)\n"); } -
branches/eam_branches/ipp-pstamp-20260421/Ohana/src/libdvo/src/HostTable.c
r40407 r43012 429 429 if (table->hosts[i].stdout.Nbuffer > 0x1000) { 430 430 int printHead = VERBOSE && (table->hosts[i].stdout.Nbuffer > 0); 431 if (printHead) fprintf (stdout, "--- stdout from %s --- (% dbytes, v1)\n", table->hosts[i].hostname, table->hosts[i].stdout.Nbuffer);431 if (printHead) fprintf (stdout, "--- stdout from %s --- (%lu bytes, v1)\n", table->hosts[i].hostname, table->hosts[i].stdout.Nbuffer); 432 432 int Nout = write (STDOUT_FILENO, table->hosts[i].stdout.buffer, table->hosts[i].stdout.Nbuffer); 433 433 if (Nout != table->hosts[i].stdout.Nbuffer) { fprintf (stderr, "(error writing log?)\n"); } … … 443 443 if (table->hosts[i].stderr.Nbuffer > 0x1000) { 444 444 int printHead = VERBOSE && (table->hosts[i].stderr.Nbuffer > 0); 445 if (printHead) fprintf (stdout, "--- stderr from %s --- (% dbytes, v1)\n", table->hosts[i].hostname, table->hosts[i].stderr.Nbuffer);445 if (printHead) fprintf (stdout, "--- stderr from %s --- (%lu bytes, v1)\n", table->hosts[i].hostname, table->hosts[i].stderr.Nbuffer); 446 446 int Nout = write (STDOUT_FILENO, table->hosts[i].stderr.buffer, table->hosts[i].stderr.Nbuffer); 447 447 if (Nout != table->hosts[i].stderr.Nbuffer) { fprintf (stderr, "(error writing log?)\n"); } … … 482 482 printHead = VERBOSE || (host->stdout.Nbuffer > 0); 483 483 EmptyIOBuffer (&host->stdout, 100, host->stdio[HOST_STDOUT]); 484 if (printHead) fprintf (stdout, "--- stdout from %s --- (% dbytes, v2)\n", host->hostname, host->stdout.Nbuffer);484 if (printHead) fprintf (stdout, "--- stdout from %s --- (%lu bytes, v2)\n", host->hostname, host->stdout.Nbuffer); 485 485 int Nout = write (STDOUT_FILENO, host->stdout.buffer, host->stdout.Nbuffer); 486 486 if (Nout != host->stdout.Nbuffer) { fprintf (stderr, "(error writing log?)\n"); } … … 491 491 printHead = VERBOSE || (host->stderr.Nbuffer > 0); 492 492 EmptyIOBuffer (&host->stderr, 100, host->stdio[HOST_STDERR]); 493 if (printHead) fprintf (stdout, "--- stderr from %s --- (% dbytes, v2)\n", host->hostname, host->stderr.Nbuffer);493 if (printHead) fprintf (stdout, "--- stderr from %s --- (%lu bytes, v2)\n", host->hostname, host->stderr.Nbuffer); 494 494 Nout = write (STDOUT_FILENO, host->stderr.buffer, host->stderr.Nbuffer); 495 495 if (Nout != host->stderr.Nbuffer) { fprintf (stderr, "(error writing log?)\n"); } … … 602 602 if (table->hosts[i][0].stdout.Nbuffer > 0x1000) { 603 603 int printHead = VERBOSE || (table->hosts[i][0].stdout.Nbuffer > 0); 604 if (printHead) fprintf (stdout, "--- stdout from %s --- (% dbytes, v1)\n", table->hosts[i][0].hostname, table->hosts[i][0].stdout.Nbuffer);604 if (printHead) fprintf (stdout, "--- stdout from %s --- (%lu bytes, v1)\n", table->hosts[i][0].hostname, table->hosts[i][0].stdout.Nbuffer); 605 605 int Nout = write (STDOUT_FILENO, table->hosts[i][0].stdout.buffer, table->hosts[i][0].stdout.Nbuffer); 606 606 if (Nout != table->hosts[i][0].stdout.Nbuffer) { fprintf (stderr, "(error writing log?)\n"); } … … 616 616 if (table->hosts[i][0].stderr.Nbuffer > 0x1000) { 617 617 int printHead = VERBOSE || (table->hosts[i][0].stderr.Nbuffer > 0); 618 if (printHead) fprintf (stdout, "--- stderr from %s --- (% dbytes, v1)\n", table->hosts[i][0].hostname, table->hosts[i][0].stderr.Nbuffer);618 if (printHead) fprintf (stdout, "--- stderr from %s --- (%lu bytes, v1)\n", table->hosts[i][0].hostname, table->hosts[i][0].stderr.Nbuffer); 619 619 int Nout = write (STDOUT_FILENO, table->hosts[i][0].stderr.buffer, table->hosts[i][0].stderr.Nbuffer); 620 620 if (Nout != table->hosts[i][0].stderr.Nbuffer) { fprintf (stderr, "(error writing log?)\n"); } … … 655 655 printHead = VERBOSE || (host->stdout.Nbuffer > 0); 656 656 EmptyIOBuffer (&host->stdout, 100, host->stdio[HOST_STDOUT]); 657 if (printHead) fprintf (stdout, "--- stdout from %s --- (% dbytes, v2)\n", host->hostname, host->stdout.Nbuffer);657 if (printHead) fprintf (stdout, "--- stdout from %s --- (%lu bytes, v2)\n", host->hostname, host->stdout.Nbuffer); 658 658 int Nout = write (STDOUT_FILENO, host->stdout.buffer, host->stdout.Nbuffer); 659 659 if (Nout != host->stdout.Nbuffer) { fprintf (stderr, "(error writing log?)\n"); } … … 664 664 printHead = VERBOSE || (host->stderr.Nbuffer > 0); 665 665 EmptyIOBuffer (&host->stderr, 100, host->stdio[HOST_STDERR]); 666 if (printHead) fprintf (stdout, "--- stderr from %s --- (% dbytes, v2)\n", host->hostname, host->stderr.Nbuffer);666 if (printHead) fprintf (stdout, "--- stderr from %s --- (%lu bytes, v2)\n", host->hostname, host->stderr.Nbuffer); 667 667 Nout = write (STDOUT_FILENO, host->stderr.buffer, host->stderr.Nbuffer); 668 668 if (Nout != host->stderr.Nbuffer) { fprintf (stderr, "(error writing log?)\n"); } -
branches/eam_branches/ipp-pstamp-20260421/Ohana/src/libdvo/src/RegionHostTable.c
r39457 r43012 412 412 if (table->hosts[i].stdout.Nbuffer > 0x1000) { 413 413 int printHead = VERBOSE || (table->hosts[i].stdout.Nbuffer > 0); 414 if (printHead) fprintf (stdout, "--- stdout from %s --- (% dbytes, v1)\n", table->hosts[i].hostname, table->hosts[i].stdout.Nbuffer);414 if (printHead) fprintf (stdout, "--- stdout from %s --- (%lu bytes, v1)\n", table->hosts[i].hostname, table->hosts[i].stdout.Nbuffer); 415 415 int Nout = write (STDOUT_FILENO, table->hosts[i].stdout.buffer, table->hosts[i].stdout.Nbuffer); 416 416 if (Nout != table->hosts[i].stdout.Nbuffer) { fprintf (stderr, "(error writing log?)\n"); } … … 426 426 if (table->hosts[i].stderr.Nbuffer > 0x1000) { 427 427 int printHead = VERBOSE || (table->hosts[i].stderr.Nbuffer > 0); 428 if (printHead) fprintf (stdout, "--- stderr from %s --- (% dbytes, v1)\n", table->hosts[i].hostname, table->hosts[i].stderr.Nbuffer);428 if (printHead) fprintf (stdout, "--- stderr from %s --- (%lu bytes, v1)\n", table->hosts[i].hostname, table->hosts[i].stderr.Nbuffer); 429 429 int Nout = write (STDOUT_FILENO, table->hosts[i].stderr.buffer, table->hosts[i].stderr.Nbuffer); 430 430 if (Nout != table->hosts[i].stderr.Nbuffer) { fprintf (stderr, "(error writing log?)\n"); } … … 465 465 printHead = VERBOSE || (host->stdout.Nbuffer > 0); 466 466 EmptyIOBuffer (&host->stdout, 100, host->stdio[HOST_STDOUT]); 467 if (printHead) fprintf (stdout, "--- stdout from %s --- (% dbytes, v2)\n", host->hostname, host->stdout.Nbuffer);467 if (printHead) fprintf (stdout, "--- stdout from %s --- (%lu bytes, v2)\n", host->hostname, host->stdout.Nbuffer); 468 468 int Nout = write (STDOUT_FILENO, host->stdout.buffer, host->stdout.Nbuffer); 469 469 if (Nout != host->stdout.Nbuffer) { fprintf (stderr, "(error writing log?)\n"); } … … 474 474 printHead = VERBOSE || (host->stderr.Nbuffer > 0); 475 475 EmptyIOBuffer (&host->stderr, 100, host->stdio[HOST_STDERR]); 476 if (printHead) fprintf (stdout, "--- stderr from %s --- (% dbytes, v2)\n", host->hostname, host->stderr.Nbuffer);476 if (printHead) fprintf (stdout, "--- stderr from %s --- (%lu bytes, v2)\n", host->hostname, host->stderr.Nbuffer); 477 477 Nout = write (STDOUT_FILENO, host->stderr.buffer, host->stderr.Nbuffer); 478 478 if (Nout != host->stderr.Nbuffer) { fprintf (stderr, "(error writing log?)\n"); } -
branches/eam_branches/ipp-pstamp-20260421/Ohana/src/libohana/include/ohana.h
r42821 r43012 283 283 typedef struct { 284 284 char *buffer; 285 intNalloc;286 intNreset;287 intNblock;288 intNbuffer;285 size_t Nalloc; 286 size_t Nreset; 287 size_t Nblock; 288 size_t Nbuffer; 289 289 } IOBuffer; 290 290 -
branches/eam_branches/ipp-pstamp-20260421/Ohana/src/opihi/pantasks/CheckJobs.c
r38986 r43012 51 51 /* push output buffer data to the stdout and stderr queues */ 52 52 /* XXX this will break on 0 values in output streams */ 53 if (DEBUG) fprintf (stderr, "job: (%zx) % d of %d\n", (size_t) job[0].stdout_buff.buffer, job[0].stdout_buff.Nbuffer, job[0].stdout_buff.Nalloc);53 if (DEBUG) fprintf (stderr, "job: (%zx) %lu of %lu\n", (size_t) job[0].stdout_buff.buffer, job[0].stdout_buff.Nbuffer, job[0].stdout_buff.Nalloc); 54 54 PushNamedQueue ("stdout", job[0].stdout_buff.buffer); 55 55 PushNamedQueue ("stderr", job[0].stderr_buff.buffer); -
branches/eam_branches/ipp-pstamp-20260421/Ohana/src/opihi/pantasks/CheckTasks.c
r41483 r43012 80 80 } 81 81 82 if (DEBUG) fprintf (stderr, "create job: (%zx) % d of %d\n", (size_t) job[0].stdout_buff.buffer, job[0].stdout_buff.Nbuffer, job[0].stdout_buff.Nalloc);82 if (DEBUG) fprintf (stderr, "create job: (%zx) %lu of %lu\n", (size_t) job[0].stdout_buff.buffer, job[0].stdout_buff.Nbuffer, job[0].stdout_buff.Nalloc); 83 83 84 84 /* execute job */ -
branches/eam_branches/ipp-pstamp-20260421/Ohana/src/opihi/pantasks/JobOps.c
r40424 r43012 256 256 257 257 if (job[0].mode == JOB_LOCAL) { 258 if (DEBUG) fprintf (stderr, "submit job: (%zx) % d of %d\n", (size_t) job[0].stdout_buff.buffer, job[0].stdout_buff.Nbuffer, job[0].stdout_buff.Nalloc);258 if (DEBUG) fprintf (stderr, "submit job: (%zx) %lu of %lu\n", (size_t) job[0].stdout_buff.buffer, job[0].stdout_buff.Nbuffer, job[0].stdout_buff.Nalloc); 259 259 status = SubmitLocalJob (job); 260 260 } else { -
branches/eam_branches/ipp-pstamp-20260421/Ohana/src/opihi/pantasks/ListenClients.c
r41483 r43012 137 137 } 138 138 139 if (DEBUG) fprintf (stderr, "read % dtotal bytes\n", buffers[i][0].Nbuffer);139 if (DEBUG) fprintf (stderr, "read %lu total bytes\n", buffers[i][0].Nbuffer); 140 140 141 141 /* see if we have a complete message waiting; if not, keep waiting for messages */ -
branches/eam_branches/ipp-pstamp-20260421/Ohana/src/opihi/pantasks/LocalJob.c
r37996 r43012 16 16 17 17 if ((job[0].state == JOB_EXIT) || (job[0].state == JOB_CRASH)) { 18 if (DEBUG) fprintf (stderr, "empty buffer 0: (%zx) % d of %d\n", (size_t) job[0].stdout_buff.buffer, job[0].stdout_buff.Nbuffer, job[0].stdout_buff.Nalloc);18 if (DEBUG) fprintf (stderr, "empty buffer 0: (%zx) %lu of %lu\n", (size_t) job[0].stdout_buff.buffer, job[0].stdout_buff.Nbuffer, job[0].stdout_buff.Nalloc); 19 19 EmptyIOBuffer (&job[0].stdout_buff, 10, job[0].stdout_fd); 20 20 EmptyIOBuffer (&job[0].stderr_buff, 10, job[0].stderr_fd); 21 if (DEBUG) fprintf (stderr, "empty buffer 1: (%zx) % d of %d\n", (size_t) job[0].stdout_buff.buffer, job[0].stdout_buff.Nbuffer, job[0].stdout_buff.Nalloc);21 if (DEBUG) fprintf (stderr, "empty buffer 1: (%zx) %lu of %lu\n", (size_t) job[0].stdout_buff.buffer, job[0].stdout_buff.Nbuffer, job[0].stdout_buff.Nalloc); 22 22 close (job[0].stdout_fd); 23 23 close (job[0].stderr_fd); … … 26 26 } else { 27 27 /* read stdout buffer */ 28 if (DEBUG) fprintf (stderr, "read buffer 0: (%zx) % d of %d\n", (size_t) job[0].stdout_buff.buffer, job[0].stdout_buff.Nbuffer, job[0].stdout_buff.Nalloc);28 if (DEBUG) fprintf (stderr, "read buffer 0: (%zx) %lu of %lu\n", (size_t) job[0].stdout_buff.buffer, job[0].stdout_buff.Nbuffer, job[0].stdout_buff.Nalloc); 29 29 while ((Nread = ReadtoIOBuffer (&job[0].stdout_buff, job[0].stdout_fd)) > 0); 30 30 switch (Nread) { … … 35 35 case 0: /* pipe is closed, change child state? **/ 36 36 default: /* data in pipe */ 37 // fprintf (stderr, "read %d bytes (Nblock: % d, Nbuffer: %d)\n", Nread, job[0].stdout.Nblock, job[0].stdout.Nbuffer);37 // fprintf (stderr, "read %d bytes (Nblock: %lu, Nbuffer: %lu)\n", Nread, job[0].stdout.Nblock, job[0].stdout.Nbuffer); 38 38 break; 39 39 } 40 if (DEBUG) fprintf (stderr, "read buffer 1: (%zx) % d of %d\n", (size_t) job[0].stdout_buff.buffer, job[0].stdout_buff.Nbuffer, job[0].stdout_buff.Nalloc);40 if (DEBUG) fprintf (stderr, "read buffer 1: (%zx) %lu of %lu\n", (size_t) job[0].stdout_buff.buffer, job[0].stdout_buff.Nbuffer, job[0].stdout_buff.Nalloc); 41 41 42 42 /* read stderr buffer */ -
branches/eam_branches/ipp-pstamp-20260421/Ohana/src/opihi/pantasks/controller_check.c
r10660 r43012 23 23 if (VerboseMode()) { 24 24 gprint (GP_LOG, "controller command sent\n"); 25 gprint (GP_LOG, "\n Nbytes received: % d\n", buffer.Nbuffer);25 gprint (GP_LOG, "\n Nbytes received: %lu\n", buffer.Nbuffer); 26 26 } 27 27 gwrite (buffer.buffer, 1, buffer.Nbuffer, GP_LOG); -
branches/eam_branches/ipp-pstamp-20260421/Ohana/src/opihi/pclient/status.c
r39457 r43012 18 18 gprint (GP_LOG, "STATUS %s\n", status_string); 19 19 gprint (GP_LOG, "EXITST %d\n", ChildExitStatus); 20 gprint (GP_LOG, "STDOUT % d\n", child_stdout.Nbuffer);21 gprint (GP_LOG, "STDERR % d\n", child_stderr.Nbuffer);20 gprint (GP_LOG, "STDOUT %lu\n", child_stdout.Nbuffer); 21 gprint (GP_LOG, "STDERR %lu\n", child_stderr.Nbuffer); 22 22 23 23 set_str_variable ("JOBSTATUS", status_string); -
branches/eam_branches/ipp-pstamp-20260421/Ohana/src/opihi/pcontrol/GetJobOutput.c
r20047 r43012 39 39 if (status == -1) nanosleep (&request, &remain); 40 40 } 41 if (VerboseMode()) gprint (GP_ERR, "%s\n Read % dof %d bytes so far\n", output[0].buffer.buffer, output[0].buffer.Nbuffer, output[0].size);41 if (VerboseMode()) gprint (GP_ERR, "%s\n Read %lu of %d bytes so far\n", output[0].buffer.buffer, output[0].buffer.Nbuffer, output[0].size); 42 42 if (status == 0) { 43 43 if (VerboseMode()) gprint (GP_ERR, "host %s is down\n", host[0].hostname); … … 58 58 if (status == -1) nanosleep (&request, &remain); 59 59 } 60 if (VerboseMode()) gprint (GP_ERR, "%s\n Read % dof %d bytes so far\n", output[0].buffer.buffer, output[0].buffer.Nbuffer, output[0].size);60 if (VerboseMode()) gprint (GP_ERR, "%s\n Read %lu of %d bytes so far\n", output[0].buffer.buffer, output[0].buffer.Nbuffer, output[0].size); 61 61 if (status == 0) { 62 62 if (VerboseMode()) gprint (GP_ERR, "host %s is down\n", host[0].hostname); -
branches/eam_branches/ipp-pstamp-20260421/Ohana/src/photdbc/src/PclientCommands.c
r34088 r43012 91 91 if (status == -1) nanosleep (&request, &remain); 92 92 } 93 if (DEBUG) fprintf (stderr, "Read % dof %d bytes so far\n", output->Nbuffer, size);93 if (DEBUG) fprintf (stderr, "Read %lu of %d bytes so far\n", output->Nbuffer, size); 94 94 if (status == 0) { 95 95 fprintf (stderr, "client down\n"); … … 109 109 if (status == -1) nanosleep (&request, &remain); 110 110 } 111 if (DEBUG) fprintf (stderr, "Read % dof %d bytes so far\n", output->Nbuffer, size);111 if (DEBUG) fprintf (stderr, "Read %lu of %d bytes so far\n", output->Nbuffer, size); 112 112 if (!status) { 113 113 fprintf (stderr, "pclient down?\n"); // return PCLIENT_DOWN; -
branches/eam_branches/ipp-pstamp-20260421/Ohana/src/tools/src/fits_to_mysql.c
r42389 r43012 478 478 fprintf (stderr, "failed to create table:\n"); 479 479 fprintf (stderr, "%s\n", mysql_error(mysql)); 480 fprintf (stderr, "Nbuffer: % d\n", buffer.Nbuffer);480 fprintf (stderr, "Nbuffer: %lu\n", buffer.Nbuffer); 481 481 dump_on_failure (&buffer); 482 482 } … … 937 937 fprintf (stderr, "error with insert:\n"); 938 938 fprintf (stderr, "%s\n", mysql_error(mysql)); 939 fprintf (stderr, "Nbuffer: % d\n", buffer->Nbuffer);939 fprintf (stderr, "Nbuffer: %lu\n", buffer->Nbuffer); 940 940 dump_on_failure (buffer); 941 941 }
Note:
See TracChangeset
for help on using the changeset viewer.
