Skip to content

Commit 9d9740a

Browse files
interkosmosinterkosmos
committed
Rename modules. Update IPC message module.
1 parent d78b219 commit 9d9740a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1194
-624
lines changed

‎CHANGELOG.md‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,22 @@ All notable changes to the project will be documented in this file.
66

77
## Library
88

9+
* `Added` error codes
10+
* `Added` interface bindings to NNG
911
* `Added` module `dm_arg_parser` (outsourced from `dm_arg`)
1012
* `Added` module `dm_group` for observation groups
1113
* `Added` module `dm_ipc` for NNG socket access
1214
* `Added` module `dm_ipc_message` for NNG message handling
1315
* `Added` module `dm_ipc_mutex` for NNG mutex access
1416
* `Added` module `dm_ipc_thread` for NNG thread access
1517
* `Added` module `dm_job_list` (outsourced from `dm_job`)
16-
* `Added` interface bindings to NNG
17-
* `Added` error codes
18-
* `Changed` names of modules `dm_mqueue`, `dm_mqueue_util`, `dm_sem`,
19-
`dm_signal`, `dm_thread`, `dm_tty` to include `posix` prefix
20-
* `Changed` model of observation data structure `dm_observ`
18+
* `Changed` names of modules `dm_fifo`, `dm_mqueue`, `dm_mqueue_util`, `dm_pipe`,
19+
`dm_sem`, `dm_signal`, `dm_thread`, `dm_tty` to include `posix` prefix
20+
* `Changed` name of module `dm_system` to `dm_posix`
21+
* `Changed` database schema
2122
* `Changed` default database suffix from `.sqlite` to `.db`
22-
* `Changed` database schema version
23+
* `Changed` GeoCOM API for Lua to accept prototype observation as first argument
24+
* `Changed` model of observation data structure `dm_observ`
2325
* `Deleted` model of request data strucutre `dm_request`
2426

2527
## Programs

‎Makefile‎

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,6 @@ SRC = $(SRCDIR)/dm_ansi.f90 \
269269
$(SRCDIR)/dm_env.f90 \
270270
$(SRCDIR)/dm_error.f90 \
271271
$(SRCDIR)/dm_fcgi.f90 \
272-
$(SRCDIR)/dm_fifo.f90 \
273272
$(SRCDIR)/dm_file.f90 \
274273
$(SRCDIR)/dm_filter.f90 \
275274
$(SRCDIR)/dm_format.f90 \
@@ -322,12 +321,14 @@ SRC = $(SRCDIR)/dm_ansi.f90 \
322321
$(SRCDIR)/dm_observ.f90 \
323322
$(SRCDIR)/dm_path.f90 \
324323
$(SRCDIR)/dm_person.f90 \
325-
$(SRCDIR)/dm_pipe.f90 \
326324
$(SRCDIR)/dm_platform.F90 \
327325
$(SRCDIR)/dm_plot.f90 \
326+
$(SRCDIR)/dm_posix.f90 \
327+
$(SRCDIR)/dm_posix_fifo.f90 \
328328
$(SRCDIR)/dm_posix_mqueue.f90 \
329329
$(SRCDIR)/dm_posix_mqueue_util.f90 \
330330
$(SRCDIR)/dm_posix_mutex.f90 \
331+
$(SRCDIR)/dm_posix_pipe.f90 \
331332
$(SRCDIR)/dm_posix_sem.f90 \
332333
$(SRCDIR)/dm_posix_signal.f90 \
333334
$(SRCDIR)/dm_posix_thread.f90 \
@@ -344,7 +345,6 @@ SRC = $(SRCDIR)/dm_ansi.f90 \
344345
$(SRCDIR)/dm_statistics.f90 \
345346
$(SRCDIR)/dm_string.f90 \
346347
$(SRCDIR)/dm_sync.f90 \
347-
$(SRCDIR)/dm_system.f90 \
348348
$(SRCDIR)/dm_target.f90 \
349349
$(SRCDIR)/dm_test.f90 \
350350
$(SRCDIR)/dm_time.f90 \
@@ -395,7 +395,6 @@ OBJ = dm_ansi.o \
395395
dm_env.o \
396396
dm_error.o \
397397
dm_fcgi.o \
398-
dm_fifo.o \
399398
dm_file.o \
400399
dm_filter.o \
401400
dm_format.o \
@@ -448,12 +447,14 @@ OBJ = dm_ansi.o \
448447
dm_observ.o \
449448
dm_path.o \
450449
dm_person.o \
451-
dm_pipe.o \
452450
dm_platform.o \
453451
dm_plot.o \
452+
dm_posix.o \
453+
dm_posix_fifo.o \
454454
dm_posix_mqueue.o \
455455
dm_posix_mqueue_util.o \
456456
dm_posix_mutex.o \
457+
dm_posix_pipe.o \
457458
dm_posix_sem.o \
458459
dm_posix_signal.o \
459460
dm_posix_thread.o \
@@ -470,7 +471,6 @@ OBJ = dm_ansi.o \
470471
dm_statistics.o \
471472
dm_string.o \
472473
dm_sync.o \
473-
dm_system.o \
474474
dm_target.o \
475475
dm_test.o \
476476
dm_time.o \
@@ -573,6 +573,7 @@ test: dmtestapi \
573573
dmtesthtml \
574574
dmtestid \
575575
dmtestipc \
576+
dmtestipcmutex \
576577
dmtestipcthread \
577578
dmtestjob \
578579
dmtestjson \
@@ -588,9 +589,10 @@ test: dmtestapi \
588589
dmtestnml \
589590
dmtestobserv \
590591
dmtestpath \
591-
dmtestpipe \
592592
dmtestplot \
593+
dmtestposix \
593594
dmtestposixmqueue \
595+
dmtestposixpipe \
594596
dmtestposixthread \
595597
dmtestregex \
596598
dmtestroff \
@@ -599,7 +601,6 @@ test: dmtestapi \
599601
dmtestserial \
600602
dmteststatistics \
601603
dmteststring \
602-
dmtestsystem \
603604
dmtesttime \
604605
dmtesttty \
605606
dmtestunit \
@@ -816,9 +817,6 @@ dm_error.o: $(SRCDIR)/dm_error.f90
816817
dm_fcgi.o: $(SRCDIR)/dm_fcgi.f90
817818
$(FC) $(FFLAGS) $(LIBFLAGS) $(MODFLAGS) -c $(SRCDIR)/dm_fcgi.f90
818819

819-
dm_fifo.o: $(SRCDIR)/dm_fifo.f90
820-
$(FC) $(FFLAGS) $(LIBFLAGS) $(MODFLAGS) -c $(SRCDIR)/dm_fifo.f90
821-
822820
dm_file.o: $(SRCDIR)/dm_file.f90
823821
$(FC) $(FFLAGS) $(LIBFLAGS) $(MODFLAGS) -c $(SRCDIR)/dm_file.f90
824822

@@ -975,15 +973,18 @@ dm_path.o: $(SRCDIR)/dm_path.f90
975973
dm_person.o: $(SRCDIR)/dm_person.f90
976974
$(FC) $(FFLAGS) $(LIBFLAGS) $(MODFLAGS) -c $(SRCDIR)/dm_person.f90
977975

978-
dm_pipe.o: $(SRCDIR)/dm_pipe.f90
979-
$(FC) $(FFLAGS) $(LIBFLAGS) $(MODFLAGS) -c $(SRCDIR)/dm_pipe.f90
980-
981976
dm_platform.o: $(SRCDIR)/dm_platform.F90
982977
$(FC) $(FFLAGS) $(PPFLAGS) $(LIBFLAGS) $(MODFLAGS) -c $(SRCDIR)/dm_platform.F90
983978

984979
dm_plot.o: $(SRCDIR)/dm_plot.f90
985980
$(FC) $(FFLAGS) $(LIBFLAGS) $(MODFLAGS) -c $(SRCDIR)/dm_plot.f90
986981

982+
dm_posix.o: $(SRCDIR)/dm_posix.f90
983+
$(FC) $(FFLAGS) $(LIBFLAGS) $(MODFLAGS) -c $(SRCDIR)/dm_posix.f90
984+
985+
dm_posix_fifo.o: $(SRCDIR)/dm_posix_fifo.f90
986+
$(FC) $(FFLAGS) $(LIBFLAGS) $(MODFLAGS) -c $(SRCDIR)/dm_posix_fifo.f90
987+
987988
dm_posix_mqueue.o: $(SRCDIR)/dm_posix_mqueue.f90
988989
$(FC) $(FFLAGS) $(LIBFLAGS) $(MODFLAGS) -c $(SRCDIR)/dm_posix_mqueue.f90
989990

@@ -993,6 +994,9 @@ dm_posix_mqueue_util.o: $(SRCDIR)/dm_posix_mqueue_util.f90
993994
dm_posix_mutex.o: $(SRCDIR)/dm_posix_mutex.f90
994995
$(FC) $(FFLAGS) $(LIBFLAGS) $(MODFLAGS) -c $(SRCDIR)/dm_posix_mutex.f90
995996

997+
dm_posix_pipe.o: $(SRCDIR)/dm_posix_pipe.f90
998+
$(FC) $(FFLAGS) $(LIBFLAGS) $(MODFLAGS) -c $(SRCDIR)/dm_posix_pipe.f90
999+
9961000
dm_posix_sem.o: $(SRCDIR)/dm_posix_sem.f90
9971001
$(FC) $(FFLAGS) $(LIBFLAGS) $(MODFLAGS) -c $(SRCDIR)/dm_posix_sem.f90
9981002

@@ -1041,9 +1045,6 @@ dm_string.o: $(SRCDIR)/dm_string.f90
10411045
dm_sync.o: $(SRCDIR)/dm_sync.f90
10421046
$(FC) $(FFLAGS) $(LIBFLAGS) $(MODFLAGS) -c $(SRCDIR)/dm_sync.f90
10431047

1044-
dm_system.o: $(SRCDIR)/dm_system.f90
1045-
$(FC) $(FFLAGS) $(LIBFLAGS) $(MODFLAGS) -c $(SRCDIR)/dm_system.f90
1046-
10471048
dm_target.o: $(SRCDIR)/dm_target.f90
10481049
$(FC) $(FFLAGS) $(LIBFLAGS) $(MODFLAGS) -c $(SRCDIR)/dm_target.f90
10491050

@@ -1119,12 +1120,7 @@ $(TARGET): $(SRC)
11191120
@$(MAKE) dm_id.o
11201121
@$(MAKE) dm_net.o
11211122
@$(MAKE) dm_uuid.o
1122-
@$(MAKE) dm_pipe.o
1123-
@$(MAKE) dm_freebsd.o
1124-
@$(MAKE) dm_linux.o
1125-
@$(MAKE) dm_system.o
11261123
@$(MAKE) dm_dp.o
1127-
@$(MAKE) dm_fifo.o
11281124
@$(MAKE) dm_node.o
11291125
@$(MAKE) dm_sensor.o
11301126
@$(MAKE) dm_target.o
@@ -1139,11 +1135,13 @@ $(TARGET): $(SRC)
11391135
@$(MAKE) dm_arg_parser.o
11401136
@$(MAKE) dm_job.o
11411137
@$(MAKE) dm_job_list.o
1142-
@$(MAKE) dm_plot.o
1143-
@$(MAKE) dm_report.o
1144-
@$(MAKE) dm_regex.o
11451138
@$(MAKE) dm_sync.o
11461139
@$(MAKE) dm_beat.o
1140+
@$(MAKE) dm_posix_pipe.o
1141+
@$(MAKE) dm_freebsd.o
1142+
@$(MAKE) dm_linux.o
1143+
@$(MAKE) dm_posix.o
1144+
@$(MAKE) dm_posix_fifo.o
11471145
@$(MAKE) dm_posix_tty.o
11481146
@$(MAKE) dm_posix_thread.o
11491147
@$(MAKE) dm_posix_signal.o
@@ -1152,6 +1150,9 @@ $(TARGET): $(SRC)
11521150
@$(MAKE) dm_posix_mqueue.o
11531151
@$(MAKE) dm_logger.o
11541152
@$(MAKE) dm_posix_mqueue_util.o
1153+
@$(MAKE) dm_plot.o
1154+
@$(MAKE) dm_report.o
1155+
@$(MAKE) dm_regex.o
11551156
@$(MAKE) dm_test.o
11561157
@$(MAKE) dm_nml.o
11571158
@$(MAKE) dm_hdf5.o
@@ -1309,6 +1310,9 @@ dmtestid: test/dmtestid.f90 $(TARGET)
13091310
dmtestipc: test/dmtestipc.f90 $(TARGET)
13101311
$(FC) $(FFLAGS) $(MODFLAGS) $(LDFLAGS) -o dmtestipc test/dmtestipc.f90 $(TARGET) $(LIBNNG) $(LDLIBS)
13111312

1313+
dmtestipcmutex: test/dmtestipcmutex.f90 $(TARGET)
1314+
$(FC) $(FFLAGS) $(MODFLAGS) $(LDFLAGS) -o dmtestipcmutex test/dmtestipcmutex.f90 $(TARGET) $(LIBNNG) $(LDLIBS)
1315+
13121316
dmtestipcthread: test/dmtestipcthread.f90 $(TARGET)
13131317
$(FC) $(FFLAGS) $(MODFLAGS) $(LDFLAGS) -o dmtestipcthread test/dmtestipcthread.f90 $(TARGET) $(LIBNNG) $(LDLIBS)
13141318

@@ -1354,15 +1358,18 @@ dmtestobserv: test/dmtestobserv.f90 $(TARGET)
13541358
dmtestpath: test/dmtestpath.f90 $(TARGET)
13551359
$(FC) $(FFLAGS) $(MODFLAGS) $(LDFLAGS) -o dmtestpath test/dmtestpath.f90 $(TARGET) $(LDLIBS)
13561360

1357-
dmtestpipe: test/dmtestpipe.f90 $(TARGET)
1358-
$(FC) $(FFLAGS) $(MODFLAGS) $(LDFLAGS) -o dmtestpipe test/dmtestpipe.f90 $(TARGET) $(LDLIBS)
1359-
13601361
dmtestplot: test/dmtestplot.f90 $(TARGET)
13611362
$(FC) $(FFLAGS) $(MODFLAGS) $(LDFLAGS) -o dmtestplot test/dmtestplot.f90 $(TARGET) $(LDLIBS)
13621363

1364+
dmtestposix: test/dmtestposix.f90 $(TARGET)
1365+
$(FC) $(FFLAGS) $(MODFLAGS) $(LDFLAGS) -o dmtestposix test/dmtestposix.f90 $(TARGET) $(LDLIBS)
1366+
13631367
dmtestposixmqueue: test/dmtestposixmqueue.f90 $(TARGET)
13641368
$(FC) $(FFLAGS) $(MODFLAGS) $(LDFLAGS) -o dmtestposixmqueue test/dmtestposixmqueue.f90 $(TARGET) $(LIBRT) $(LDLIBS)
13651369

1370+
dmtestposixpipe: test/dmtestposixpipe.f90 $(TARGET)
1371+
$(FC) $(FFLAGS) $(MODFLAGS) $(LDFLAGS) -o dmtestposixpipe test/dmtestposixpipe.f90 $(TARGET) $(LDLIBS)
1372+
13661373
dmtestposixthread: test/dmtestposixthread.f90 $(TARGET)
13671374
$(FC) $(FFLAGS) $(MODFLAGS) $(LDFLAGS) -o dmtestposixthread test/dmtestposixthread.f90 $(TARGET) $(LIBPTHREAD) $(LDLIBS)
13681375

@@ -1387,9 +1394,6 @@ dmteststatistics: test/dmteststatistics.f90 $(TARGET)
13871394
dmteststring: test/dmteststring.f90 $(TARGET)
13881395
$(FC) $(FFLAGS) $(MODFLAGS) $(LDFLAGS) -o dmteststring test/dmteststring.f90 $(TARGET) $(LDLIBS)
13891396

1390-
dmtestsystem: test/dmtestsystem.f90 $(TARGET)
1391-
$(FC) $(FFLAGS) $(MODFLAGS) $(LDFLAGS) -o dmtestsystem test/dmtestsystem.f90 $(TARGET) $(LDLIBS)
1392-
13931397
dmtesttime: test/dmtesttime.f90 $(TARGET)
13941398
$(FC) $(FFLAGS) $(MODFLAGS) $(LDFLAGS) -o dmtesttime test/dmtesttime.f90 $(TARGET) $(LDLIBS)
13951399

‎app/dmapi.f90‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ subroutine route_beat(env)
280280

281281
call serial%create(beat, api_format_from_mime(mime), callback=dm_fcgi_write, header=header, newline=.true.)
282282
call serial%next(beat)
283-
call serial%destroy()
283+
call serial%finalize()
284284
end block response_block
285285

286286
call dm_db_close(db)
@@ -353,7 +353,7 @@ subroutine route_beats(env)
353353
rc = dm_db_select(db, dbs, beat, validate=.false.)
354354
end do
355355

356-
call serial%destroy()
356+
call serial%finalize()
357357
end block response_block
358358

359359
call dm_db_finalize(dbs)
@@ -851,7 +851,7 @@ subroutine route_log(env)
851851

852852
call serial%create(log, api_format_from_mime(mime), callback=dm_fcgi_write)
853853
call serial%next(log)
854-
call serial%destroy()
854+
call serial%finalize()
855855
end block response_block
856856

857857
call dm_db_close(db)
@@ -976,7 +976,7 @@ subroutine route_logs(env)
976976
rc = dm_db_select(db, dbs, log, validate=.false.)
977977
end do
978978

979-
call serial%destroy()
979+
call serial%finalize()
980980
end block response_block
981981

982982
call dm_db_finalize(dbs)
@@ -1154,7 +1154,7 @@ subroutine route_node(env)
11541154

11551155
call serial%create(node, api_format_from_mime(mime), callback=dm_fcgi_write)
11561156
call serial%next(node)
1157-
call serial%destroy()
1157+
call serial%finalize()
11581158
end block response_block
11591159

11601160
call dm_db_close(db)
@@ -1173,7 +1173,7 @@ subroutine route_nodes(env)
11731173
!!
11741174
!! ## GET Parameters
11751175
!!
1176-
!! * `header` - CSV header (0 or 1).
1176+
!! * `header` - CSV header (0 or 1).
11771177
!!
11781178
!! ## GET Request Headers
11791179
!!
@@ -1225,7 +1225,7 @@ subroutine route_nodes(env)
12251225
rc = dm_db_select(db, dbs, node, validate=.false.)
12261226
end do
12271227

1228-
call serial%destroy()
1228+
call serial%finalize()
12291229
end block response_block
12301230

12311231
call dm_db_finalize(dbs)
@@ -1403,7 +1403,7 @@ subroutine route_observ(env)
14031403

14041404
call serial%create(observ, api_format_from_mime(mime), callback=dm_fcgi_write)
14051405
call serial%next(observ)
1406-
call serial%destroy()
1406+
call serial%finalize()
14071407
end block response_block
14081408

14091409
call dm_db_close(db)
@@ -1553,7 +1553,7 @@ subroutine route_observs(env)
15531553
rc = dm_db_select(db, dbs, observ, validate=.false.)
15541554
end do
15551555

1556-
call serial%destroy()
1556+
call serial%finalize()
15571557
end block response_block
15581558

15591559
call dm_db_finalize(dbs)
@@ -1777,7 +1777,7 @@ subroutine route_sensor(env)
17771777

17781778
call serial%create(sensor, api_format_from_mime(mime), callback=dm_fcgi_write)
17791779
call serial%next(sensor)
1780-
call serial%destroy()
1780+
call serial%finalize()
17811781
end block response_block
17821782

17831783
call dm_db_close(db)
@@ -1849,7 +1849,7 @@ subroutine route_sensors(env)
18491849
rc = dm_db_select(db, dbs, sensor, validate=.false.)
18501850
end do
18511851

1852-
call serial%destroy()
1852+
call serial%finalize()
18531853
end block response_block
18541854

18551855
call dm_db_finalize(dbs)
@@ -2021,7 +2021,7 @@ subroutine route_target(env)
20212021

20222022
call serial%create(target, api_format_from_mime(mime), callback=dm_fcgi_write)
20232023
call serial%next(target)
2024-
call serial%destroy()
2024+
call serial%finalize()
20252025
end block response_block
20262026

20272027
call dm_db_close(db)
@@ -2092,7 +2092,7 @@ subroutine route_targets(env)
20922092
rc = dm_db_select(db, dbs, target, validate=.false.)
20932093
end do
20942094

2095-
call serial%destroy()
2095+
call serial%finalize()
20962096
end block response_block
20972097

20982098
call dm_db_finalize(dbs)

‎app/dmbeat.f90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ integer function run(app) result(rc)
112112
if (app%count > 0) call logger%debug('starting transmission ' // dm_itoa(iter) // '/' // dm_itoa(app%count))
113113

114114
! Update heartbeat attributes.
115-
call dm_system_uptime(uptime, stat)
115+
call dm_posix_uptime(uptime, stat)
116116
call dm_beat_set(beat, time_sent=dm_time_now(), error=rc_last, uptime=int(uptime))
117117

118118
! Send RPC request to API, use compression if available.

0 commit comments

Comments
 (0)