move pio klass definitions to file.c

Author: funny-falcon

src/utils/file.c

@@ -3924,26 +3924,35 @@ fio_communicate(int in, int out)
 }
 
 // CLASSES
+
 typedef struct pioLocalDrive
 {
 } pioLocalDrive;
+#define kls__pioLocalDrive	iface__pioDrive, iface(pioDrive)
+fobj_klass(pioLocalDrive);
 
 typedef struct pioRemoteDrive
 {
 } pioRemoteDrive;
+#define kls__pioRemoteDrive	iface__pioDrive, iface(pioDrive)
+fobj_klass(pioRemoteDrive);
 
 typedef struct pioFile
 {
     const char *path;
     int		flags;
     bool	closed;
 } pioFile;
+#define kls__pioFile	mth(fobjDispose)
+fobj_klass(pioFile);
 
 typedef struct pioLocalFile
 {
     pioFile	p;
     int		fd;
 } pioLocalFile;
+#define kls__pioLocalFile	iface__pioFile, iface(pioFile)
+fobj_klass(pioLocalFile);
 
 typedef struct pioRemoteFile
 {
@@ -3957,6 +3966,9 @@ typedef struct pioRemoteFile
     void*   asyncChunk;
     ft_bytes_t  chunkRest;
 } pioRemoteFile;
+#define kls__pioRemoteFile	iface__pioFile, iface(pioFile), \
+                            mth(pioSetAsync, pioAsyncRead, pioAsyncWrite, pioAsyncError)
+fobj_klass(pioRemoteFile);
 
 typedef struct pioReadFilter {
     pioRead_i	wrapped;
@@ -3967,6 +3979,8 @@ typedef struct pioReadFilter {
     bool        eof;
     bool        finished;
 } pioReadFilter;
+#define kls__pioReadFilter	mth(pioRead, pioClose)
+fobj_klass(pioReadFilter);
 
 typedef struct pioWriteFilter {
     pioWriteFlush_i	wrapped;
@@ -3975,6 +3989,9 @@ typedef struct pioWriteFilter {
     size_t			capa;
     bool			finished;
 } pioWriteFilter;
+#define kls__pioWriteFilter iface__pioWriteFlush, iface(pioWriteFlush), \
+                            mth(pioClose)
+fobj_klass(pioWriteFilter);
 
 #ifdef HAVE_LIBZ
 typedef struct pioGZCompress {
@@ -4008,8 +4025,6 @@ pioDriveForLocation(fio_location loc)
 }
 
 /* Base physical file type */
-#define kls__pioFile	mth(fobjDispose)
-fobj_klass(pioFile);
 
 static void
 pioFile_fobjDispose(VSelf)

src/utils/file.h

@@ -270,21 +270,12 @@ fobj_method(pioListDir);
 fobj_method(pioRemoveDir);
 
 #define iface__pioDrive 	mth(pioOpen, pioStat, pioRemove, pioRename), \
-					        mth(pioExists, pioGetCRC32, pioIsRemote, pioListDir, pioRemoveDir)
+					        mth(pioExists, pioGetCRC32, pioIsRemote),                \
+							mth(pioListDir, pioRemoveDir)
 fobj_iface(pioDrive);
 
-#define kls__pioLocalDrive	iface__pioDrive, iface(pioDrive)
-#define kls__pioRemoteDrive	iface__pioDrive, iface(pioDrive)
-fobj_klass(pioLocalDrive);
-fobj_klass(pioRemoteDrive);
-
 extern pioDrive_i pioDriveForLocation(fio_location location);
 
-#define pioFile__common_methods mth(pioRead, pioWrite, pioFlush, pioTruncate, pioClose)
-
-#define kls__pioLocalFile	iface__pioFile, iface(pioFile)
-fobj_klass(pioLocalFile);
-
 #define mth__pioSetAsync    err_i, (bool, async)
 #define mth__pioSetAsync__optional()  (async, true)
 #define mth__pioAsyncRead   size_t, (ft_bytes_t, buf), (err_i*, err)
@@ -295,10 +286,6 @@ fobj_method(pioAsyncRead);
 fobj_method(pioAsyncWrite);
 fobj_method(pioAsyncError);
 
-#define kls__pioRemoteFile	iface__pioFile, iface(pioFile), \
-                            mth(pioSetAsync, pioAsyncRead, pioAsyncWrite, pioAsyncError)
-fobj_klass(pioRemoteFile);
-
 // Filter
 typedef struct pioTransformResult {
     size_t	consumed;
@@ -315,12 +302,6 @@ fobj_method(pioFinish);
 #define iface__pioFilter	mth(pioTransform, pioFinish)
 fobj_iface(pioFilter);
 
-#define kls__pioReadFilter	mth(pioRead, pioClose)
-#define kls__pioWriteFilter iface__pioWriteFlush, iface(pioWriteFlush), \
-                            mth(pioClose)
-fobj_klass(pioReadFilter);
-fobj_klass(pioWriteFilter);
-
 extern pioWriteFlush_i pioWrapWriteFilter(pioWriteFlush_i fl,
                                           pioFilter_i flt,
                                           size_t buf_size);