Skip to content

Commit

Permalink
ffserver: cast PID to int64_t before printing
Browse files Browse the repository at this point in the history
Unfortunately, there is no portable format specifier for PID's.
Furthermore, it is not safe to assume pid_t <= 32 bit in size,
see e.g http://unix.derkeiler.com/Mailing-Lists/AIX-L/2010-08/msg00008.html.
Right now, it is ok to assume pid_t <= 32 bit in size, but this may change in the future.
Also, this patch fixes warning due to lack of an appropriate cast from
http://fate.ffmpeg.org/report.cgi?time=20150820233505&slot=x86-opensolaris-gcc4.3.
Note that this method of handling pid_t is in line with what nginx does.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
  • Loading branch information
Ganesh Ajjanagadde authored and michaelni committed Aug 21, 2015
1 parent 5edf8b1 commit 92b1a0f
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions ffserver.c
Expand Up @@ -1936,7 +1936,7 @@ static void compute_status(HTTPContext *c)

avio_printf(pb, "<h2>Feed %s</h2>", stream->filename);
if (stream->pid) {
avio_printf(pb, "Running as pid %d.\n", stream->pid);
avio_printf(pb, "Running as pid %"PRId64".\n", (int64_t) stream->pid);

#if defined(linux)
{
Expand All @@ -1945,8 +1945,8 @@ static void compute_status(HTTPContext *c)

/* This is somewhat linux specific I guess */
snprintf(ps_cmd, sizeof(ps_cmd),
"ps -o \"%%cpu,cputime\" --no-headers %d",
stream->pid);
"ps -o \"%%cpu,cputime\" --no-headers %"PRId64"",
(int64_t) stream->pid);

pid_stat = popen(ps_cmd, "r");
if (pid_stat) {
Expand Down Expand Up @@ -3778,8 +3778,8 @@ static void handle_child_exit(int sig)
uptime = time(0) - feed->pid_start;
feed->pid = 0;
fprintf(stderr,
"%s: Pid %d exited with status %d after %d seconds\n",
feed->filename, pid, status, uptime);
"%s: Pid %"PRId64" exited with status %d after %d seconds\n",
feed->filename, (int64_t) pid, status, uptime);

if (uptime < 30)
/* Turn off any more restarts */
Expand Down

0 comments on commit 92b1a0f

Please sign in to comment.