Skip to content
Snippets Groups Projects

clang-format our code with Google-style

Closed Dinyar Rabady requested to merge chore/clang-formatting into master
1 unresolved thread
33 files
+ 2415
1972
Compare changes
  • Side-by-side
  • Inline
Files
33
+ 36
38
#include "DmaInputFilter.h"
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <cassert>
#include <cstdio>
#include <cerrno>
#include <system_error>
#include <cstdio>
#include <iostream>
#include <sstream>
#include <system_error>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include "DmaInputFilter.h"
#include "log.h"
DmaInputFilter::DmaInputFilter( const std::string& deviceFileName, size_t packetBufferSize, size_t nbPacketBuffers, ctrl& control ) :
InputFilter( packetBufferSize, nbPacketBuffers, control )
{
dma_fd = open( deviceFileName.c_str(), O_RDWR | O_NONBLOCK );
if ( dma_fd < 0 ) {
throw std::system_error(errno, std::system_category(), "Cannot open DMA device: " + deviceFileName);
DmaInputFilter::DmaInputFilter(const std::string& deviceFileName,
size_t packetBufferSize, size_t nbPacketBuffers,
ctrl& control)
: InputFilter(packetBufferSize, nbPacketBuffers, control) {
dma_fd = open(deviceFileName.c_str(), O_RDWR | O_NONBLOCK);
if (dma_fd < 0) {
throw std::system_error(errno, std::system_category(),
"Cannot open DMA device: " + deviceFileName);
}
LOG(TRACE) << "Created DMA input filter";
LOG(TRACE) << "Created DMA input filter";
}
DmaInputFilter::~DmaInputFilter() {
close( dma_fd );
close(dma_fd);
LOG(TRACE) << "Destroyed DMA input filter";
}
@@ -38,10 +39,10 @@ DmaInputFilter::~DmaInputFilter() {
* systems.)
*/
#define RW_MAX_SIZE 0x7ffff000
#define RW_MAX_SIZE 0x7ffff000
static inline ssize_t read_axi_packet_to_buffer(int fd, char *buffer, uint64_t size)
{
static inline ssize_t read_axi_packet_to_buffer(int fd, char* buffer,
uint64_t size) {
ssize_t rc;
uint64_t to_read = size;
@@ -54,12 +55,11 @@ static inline ssize_t read_axi_packet_to_buffer(int fd, char *buffer, uint64_t s
if (rc <= 0) {
return rc;
}
}
return rc;
}
ssize_t DmaInputFilter::readPacketFromDMA(char **buffer, size_t bufferSize)
{
ssize_t DmaInputFilter::readPacketFromDMA(char** buffer, size_t bufferSize) {
// Read from DMA
ssize_t bytesRead = 0;
@@ -75,18 +75,22 @@ ssize_t DmaInputFilter::readPacketFromDMA(char **buffer, size_t bufferSize)
if (errno == EIO || errno == EMSGSIZE) {
if (errno == EIO) {
stats.nbDmaErrors++;
LOG(ERROR) << "#" << nbReads() << ": DMA I/O ERROR. Skipping packet #" << skip << '.';
LOG(ERROR) << "#" << nbReads() << ": DMA I/O ERROR. Skipping packet #"
<< skip << '.';
} else {
stats.nbDmaOversizedPackets++;
LOG(ERROR) << "#" << nbReads() << ": DMA read returned oversized packet. DMA returned " << bytesRead << ", buffer size is " << bufferSize << ". Skipping packet #" << skip << '.';
LOG(ERROR) << "#" << nbReads()
<< ": DMA read returned oversized packet. DMA returned "
<< bytesRead << ", buffer size is " << bufferSize
<< ". Skipping packet #" << skip << '.';
}
continue;
}
// Some fatal error occurred
std::ostringstream os;
os << "Iteration: " << nbReads() << " ERROR: DMA read failed.";
throw std::system_error(errno, std::system_category(), os.str() );
os << "Iteration: " << nbReads() << " ERROR: DMA read failed.";
throw std::system_error(errno, std::system_category(), os.str());
}
// We have some data
@@ -96,24 +100,18 @@ ssize_t DmaInputFilter::readPacketFromDMA(char **buffer, size_t bufferSize)
return bytesRead;
}
/**************************************************************************
* Entry points are here
* Overriding virtual functions
*/
// Print some additional info
void DmaInputFilter::print(std::ostream& out) const
{
out
<< ", DMA errors " << stats.nbDmaErrors
<< ", oversized " << stats.nbDmaOversizedPackets;
void DmaInputFilter::print(std::ostream& out) const {
out << ", DMA errors " << stats.nbDmaErrors << ", oversized "
<< stats.nbDmaOversizedPackets;
}
// Read a packet from DMA
ssize_t DmaInputFilter::readInput(char **buffer, size_t bufferSize)
{
return readPacketFromDMA( buffer, bufferSize );
ssize_t DmaInputFilter::readInput(char** buffer, size_t bufferSize) {
return readPacketFromDMA(buffer, bufferSize);
}
Loading