Page MenuHomeFreeBSD
Files F170730342

D12449.id33350.diff
No OneTemporary
Actions

D12449.id33350.diff
View Options

Index: head/sys/kern/subr_gtaskqueue.c
===================================================================
--- head/sys/kern/subr_gtaskqueue.c
+++ head/sys/kern/subr_gtaskqueue.c
@@ -666,7 +666,7 @@
int qid, error;
gtask->gt_uniq = uniq;
- gtask->gt_name = name;
+ snprintf(gtask->gt_name, GROUPTASK_NAMELEN, "%s", name ? name : "grouptask");
gtask->gt_irq = irq;
gtask->gt_cpu = -1;
mtx_lock(&qgroup->tqg_lock);
@@ -703,7 +703,7 @@
error = intr_setaffinity(gtask->gt_irq, CPU_WHICH_IRQ, &mask);
mtx_lock(&qgroup->tqg_lock);
if (error)
- printf("%s: setaffinity failed: %d\n", __func__, error);
+ printf("%s: %s setaffinity failed: %d\n", __func__, gtask->gt_name, error);
}
qgroup->tqg_queue[qid].tgc_cnt++;
@@ -724,7 +724,7 @@
qid = -1;
gtask->gt_uniq = uniq;
- gtask->gt_name = name;
+ snprintf(gtask->gt_name, GROUPTASK_NAMELEN, "%s", name ? name : "grouptask");
gtask->gt_irq = irq;
gtask->gt_cpu = cpu;
mtx_lock(&qgroup->tqg_lock);
@@ -736,7 +736,7 @@
}
if (qid == -1) {
mtx_unlock(&qgroup->tqg_lock);
- printf("%s: qid not found for %s cpu=%d\n", __func__, name, cpu);
+ printf("%s: qid not found for %s cpu=%d\n", __func__, gtask->gt_name, cpu);
return (EINVAL);
}
} else
@@ -775,7 +775,7 @@
}
if (qid == -1) {
mtx_unlock(&qgroup->tqg_lock);
- printf("%s: qid not found for cpu=%d\n", __func__, cpu);
+ printf("%s: qid not found for %s cpu=%d\n", __func__, gtask->gt_name, cpu);
return (EINVAL);
}
qgroup->tqg_queue[qid].tgc_cnt++;
@@ -805,7 +805,7 @@
if (qgroup->tqg_queue[i].tgc_taskq == gtask->gt_taskqueue)
break;
if (i == qgroup->tqg_cnt)
- panic("taskqgroup_detach: task not in group\n");
+ panic("taskqgroup_detach: task %s not in group\n", gtask->gt_name);
qgroup->tqg_queue[i].tgc_cnt--;
LIST_REMOVE(gtask, gt_list);
mtx_unlock(&qgroup->tqg_lock);
Index: head/sys/sys/_task.h
===================================================================
--- head/sys/sys/_task.h
+++ head/sys/sys/_task.h
@@ -65,7 +65,8 @@
void *gt_taskqueue;
LIST_ENTRY(grouptask) gt_list;
void *gt_uniq;
- char *gt_name;
+#define GROUPTASK_NAMELEN 32
+ char gt_name[GROUPTASK_NAMELEN];
int16_t gt_irq;
int16_t gt_cpu;
};

File Metadata

Mime Type
text/plain
Expires
Mon, Sep 7, 6:39 AM (21 m, 54 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38407012
Default Alt Text
D12449.id33350.diff (2 KB)

Event Timeline