Skip to content

Commit

Permalink
bpf/scripts: Make description and returns section for helpers/syscall…
Browse files Browse the repository at this point in the history
…s mandatory

This  enforce a minimal formatting consistency for the documentation. The
description and returns missing for a few helpers have also been added.

Signed-off-by: Usama Arif <usama.arif@bytedance.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Reviewed-by: Quentin Monnet <quentin@isovalent.com>
Link: https://lore.kernel.org/bpf/20220119114442.1452088-2-usama.arif@bytedance.com
  • Loading branch information
Usama Arif authored and Andrii Nakryiko committed Jan 19, 2022
1 parent e40fbbf commit f1f3f67
Showing 1 changed file with 18 additions and 12 deletions.
30 changes: 18 additions & 12 deletions scripts/bpf_doc.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,14 @@ def __init__(self, filename):

def parse_element(self):
proto = self.parse_symbol()
desc = self.parse_desc()
ret = self.parse_ret()
desc = self.parse_desc(proto)
ret = self.parse_ret(proto)
return APIElement(proto=proto, desc=desc, ret=ret)

def parse_helper(self):
proto = self.parse_proto()
desc = self.parse_desc()
ret = self.parse_ret()
desc = self.parse_desc(proto)
ret = self.parse_ret(proto)
return Helper(proto=proto, desc=desc, ret=ret)

def parse_symbol(self):
Expand Down Expand Up @@ -129,16 +129,15 @@ def parse_proto(self):
self.line = self.reader.readline()
return capture.group(1)

def parse_desc(self):
def parse_desc(self, proto):
p = re.compile(' \* ?(?:\t| {5,8})Description$')
capture = p.match(self.line)
if not capture:
# Helper can have empty description and we might be parsing another
# attribute: return but do not consume.
return ''
raise Exception("No description section found for " + proto)
# Description can be several lines, some of them possibly empty, and it
# stops when another subsection title is met.
desc = ''
desc_present = False
while True:
self.line = self.reader.readline()
if self.line == ' *\n':
Expand All @@ -147,21 +146,24 @@ def parse_desc(self):
p = re.compile(' \* ?(?:\t| {5,8})(?:\t| {8})(.*)')
capture = p.match(self.line)
if capture:
desc_present = True
desc += capture.group(1) + '\n'
else:
break

if not desc_present:
raise Exception("No description found for " + proto)
return desc

def parse_ret(self):
def parse_ret(self, proto):
p = re.compile(' \* ?(?:\t| {5,8})Return$')
capture = p.match(self.line)
if not capture:
# Helper can have empty retval and we might be parsing another
# attribute: return but do not consume.
return ''
raise Exception("No return section found for " + proto)
# Return value description can be several lines, some of them possibly
# empty, and it stops when another subsection title is met.
ret = ''
ret_present = False
while True:
self.line = self.reader.readline()
if self.line == ' *\n':
Expand All @@ -170,9 +172,13 @@ def parse_ret(self):
p = re.compile(' \* ?(?:\t| {5,8})(?:\t| {8})(.*)')
capture = p.match(self.line)
if capture:
ret_present = True
ret += capture.group(1) + '\n'
else:
break

if not ret_present:
raise Exception("No return found for " + proto)
return ret

def seek_to(self, target, help_message):
Expand Down

0 comments on commit f1f3f67

Please sign in to comment.