… | |
… | |
21 | |
21 | |
22 | package cf; |
22 | package cf; |
23 | |
23 | |
24 | use 5.10.0; |
24 | use 5.10.0; |
25 | use utf8; |
25 | use utf8; |
26 | use strict "vars", "subs"; |
26 | use strict qw(vars subs); |
27 | |
27 | |
28 | use Symbol; |
28 | use Symbol; |
29 | use List::Util; |
29 | use List::Util; |
30 | use Socket; |
30 | use Socket; |
31 | use EV; |
31 | use EV; |
32 | use Opcode; |
32 | use Opcode; |
33 | use Safe; |
33 | use Safe; |
34 | use Safe::Hole; |
34 | use Safe::Hole; |
35 | use Storable (); |
35 | use Storable (); |
36 | |
36 | |
|
|
37 | use Guard (); |
37 | use Coro (); |
38 | use Coro (); |
38 | use Coro::State; |
39 | use Coro::State; |
39 | use Coro::Handle; |
40 | use Coro::Handle; |
40 | use Coro::EV; |
41 | use Coro::EV; |
41 | use Coro::AnyEvent; |
42 | use Coro::AnyEvent; |
42 | use Coro::Timer; |
43 | use Coro::Timer; |
43 | use Coro::Signal; |
44 | use Coro::Signal; |
44 | use Coro::Semaphore; |
45 | use Coro::Semaphore; |
|
|
46 | use Coro::SemaphoreSet; |
45 | use Coro::AnyEvent; |
47 | use Coro::AnyEvent; |
46 | use Coro::AIO; |
48 | use Coro::AIO; |
47 | use Coro::BDB 1.6; |
49 | use Coro::BDB 1.6; |
48 | use Coro::Storable; |
50 | use Coro::Storable; |
49 | use Coro::Util (); |
51 | use Coro::Util (); |
… | |
… | |
70 | |
72 | |
71 | # make sure c-lzf reinitialises itself |
73 | # make sure c-lzf reinitialises itself |
72 | Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; |
74 | Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; |
73 | Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later |
75 | Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later |
74 | |
76 | |
|
|
77 | # strictly for debugging |
|
|
78 | $SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; |
|
|
79 | |
75 | sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload |
80 | sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload |
76 | |
81 | |
77 | our %COMMAND = (); |
82 | our %COMMAND = (); |
78 | our %COMMAND_TIME = (); |
83 | our %COMMAND_TIME = (); |
79 | |
84 | |
… | |
… | |
81 | our %EXTCMD = (); |
86 | our %EXTCMD = (); |
82 | our %EXTICMD = (); |
87 | our %EXTICMD = (); |
83 | our %EXT_CORO = (); # coroutines bound to extensions |
88 | our %EXT_CORO = (); # coroutines bound to extensions |
84 | our %EXT_MAP = (); # pluggable maps |
89 | our %EXT_MAP = (); # pluggable maps |
85 | |
90 | |
86 | our $RELOAD; # number of reloads so far |
91 | our $RELOAD; # number of reloads so far, non-zero while in reload |
87 | our @EVENT; |
92 | our @EVENT; |
88 | |
93 | |
89 | our $CONFDIR = confdir; |
94 | our $CONFDIR = confdir; |
90 | our $DATADIR = datadir; |
95 | our $DATADIR = datadir; |
91 | our $LIBDIR = "$DATADIR/ext"; |
96 | our $LIBDIR = "$DATADIR/ext"; |
… | |
… | |
103 | our %RESOURCE; |
108 | our %RESOURCE; |
104 | |
109 | |
105 | our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) |
110 | our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) |
106 | our $NEXT_RUNTIME_WRITE; # when should the runtime file be written |
111 | our $NEXT_RUNTIME_WRITE; # when should the runtime file be written |
107 | our $NEXT_TICK; |
112 | our $NEXT_TICK; |
108 | our $USE_FSYNC = 1; # use fsync to write maps - default off |
113 | our $USE_FSYNC = 1; # use fsync to write maps - default on |
109 | |
114 | |
110 | our $BDB_DEADLOCK_WATCHER; |
115 | our $BDB_DEADLOCK_WATCHER; |
111 | our $BDB_CHECKPOINT_WATCHER; |
116 | our $BDB_CHECKPOINT_WATCHER; |
112 | our $BDB_TRICKLE_WATCHER; |
117 | our $BDB_TRICKLE_WATCHER; |
113 | our $DB_ENV; |
118 | our $DB_ENV; |
114 | |
119 | |
|
|
120 | our @EXTRA_MODULES = qw(pod mapscript); |
|
|
121 | |
115 | our %CFG; |
122 | our %CFG; |
116 | |
123 | |
117 | our $UPTIME; $UPTIME ||= time; |
124 | our $UPTIME; $UPTIME ||= time; |
118 | our $RUNTIME; |
125 | our $RUNTIME; |
119 | our $NOW; |
126 | our $NOW; |
… | |
… | |
127 | |
134 | |
128 | our $LOAD; # a number between 0 (idle) and 1 (too many objects) |
135 | our $LOAD; # a number between 0 (idle) and 1 (too many objects) |
129 | our $LOADAVG; # same thing, but with alpha-smoothing |
136 | our $LOADAVG; # same thing, but with alpha-smoothing |
130 | our $JITTER; # average jitter |
137 | our $JITTER; # average jitter |
131 | our $TICK_START; # for load detecting purposes |
138 | our $TICK_START; # for load detecting purposes |
|
|
139 | |
|
|
140 | our @POST_INIT; |
|
|
141 | |
|
|
142 | our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) |
|
|
143 | our $REALLY_UNLOOP; # never set to true, please :) |
132 | |
144 | |
133 | binmode STDOUT; |
145 | binmode STDOUT; |
134 | binmode STDERR; |
146 | binmode STDERR; |
135 | |
147 | |
136 | # read virtual server time, if available |
148 | # read virtual server time, if available |
137 | unless ($RUNTIME || !-e $RUNTIMEFILE) { |
149 | unless ($RUNTIME || !-e $RUNTIMEFILE) { |
138 | open my $fh, "<", $RUNTIMEFILE |
150 | open my $fh, "<", $RUNTIMEFILE |
139 | or die "unable to read $RUNTIMEFILE file: $!"; |
151 | or die "unable to read $RUNTIMEFILE file: $!"; |
140 | $RUNTIME = <$fh> + 0.; |
152 | $RUNTIME = <$fh> + 0.; |
141 | } |
153 | } |
|
|
154 | |
|
|
155 | eval "sub TICK() { $TICK } 1" or die; |
142 | |
156 | |
143 | mkdir $_ |
157 | mkdir $_ |
144 | for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; |
158 | for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; |
145 | |
159 | |
146 | our $EMERGENCY_POSITION; |
160 | our $EMERGENCY_POSITION; |
… | |
… | |
305 | our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max |
319 | our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max |
306 | |
320 | |
307 | sub encode_json($) { $json_coder->encode ($_[0]) } |
321 | sub encode_json($) { $json_coder->encode ($_[0]) } |
308 | sub decode_json($) { $json_coder->decode ($_[0]) } |
322 | sub decode_json($) { $json_coder->decode ($_[0]) } |
309 | |
323 | |
|
|
324 | =item cf::post_init { BLOCK } |
|
|
325 | |
|
|
326 | Execute the given codeblock, I<after> all extensions have been (re-)loaded, |
|
|
327 | but I<before> the server starts ticking again. |
|
|
328 | |
|
|
329 | The cdoeblock will have a single boolean argument to indicate whether this |
|
|
330 | is a reload or not. |
|
|
331 | |
|
|
332 | =cut |
|
|
333 | |
|
|
334 | sub post_init(&) { |
|
|
335 | push @POST_INIT, shift; |
|
|
336 | } |
|
|
337 | |
310 | =item cf::lock_wait $string |
338 | =item cf::lock_wait $string |
311 | |
339 | |
312 | Wait until the given lock is available. See cf::lock_acquire. |
340 | Wait until the given lock is available. See cf::lock_acquire. |
313 | |
341 | |
314 | =item my $lock = cf::lock_acquire $string |
342 | =item my $lock = cf::lock_acquire $string |
315 | |
343 | |
316 | Wait until the given lock is available and then acquires it and returns |
344 | Wait until the given lock is available and then acquires it and returns |
317 | a Coro::guard object. If the guard object gets destroyed (goes out of scope, |
345 | a L<Guard> object. If the guard object gets destroyed (goes out of scope, |
318 | for example when the coroutine gets canceled), the lock is automatically |
346 | for example when the coroutine gets canceled), the lock is automatically |
319 | returned. |
347 | returned. |
320 | |
348 | |
321 | Locks are *not* recursive, locking from the same coro twice results in a |
349 | Locks are *not* recursive, locking from the same coro twice results in a |
322 | deadlocked coro. |
350 | deadlocked coro. |
… | |
… | |
328 | |
356 | |
329 | Return true if the lock is currently active, i.e. somebody has locked it. |
357 | Return true if the lock is currently active, i.e. somebody has locked it. |
330 | |
358 | |
331 | =cut |
359 | =cut |
332 | |
360 | |
333 | our %LOCK; |
361 | our $LOCKS = new Coro::SemaphoreSet; |
334 | our %LOCKER;#d# |
|
|
335 | |
362 | |
336 | sub lock_wait($) { |
363 | sub lock_wait($) { |
337 | my ($key) = @_; |
364 | $LOCKS->wait ($_[0]); |
338 | |
|
|
339 | if ($LOCKER{$key} == $Coro::current) {#d# |
|
|
340 | Carp::cluck "lock_wait($key) for already-acquired lock";#d# |
|
|
341 | return;#d# |
|
|
342 | }#d# |
|
|
343 | |
|
|
344 | # wait for lock, if any |
|
|
345 | while ($LOCK{$key}) { |
|
|
346 | push @{ $LOCK{$key} }, $Coro::current; |
|
|
347 | Coro::schedule; |
|
|
348 | } |
|
|
349 | } |
365 | } |
350 | |
366 | |
351 | sub lock_acquire($) { |
367 | sub lock_acquire($) { |
352 | my ($key) = @_; |
368 | $LOCKS->guard ($_[0]) |
353 | |
|
|
354 | # wait, to be sure we are not locked |
|
|
355 | lock_wait $key; |
|
|
356 | |
|
|
357 | $LOCK{$key} = []; |
|
|
358 | $LOCKER{$key} = $Coro::current;#d# |
|
|
359 | |
|
|
360 | Coro::guard { |
|
|
361 | delete $LOCKER{$key};#d# |
|
|
362 | # wake up all waiters, to be on the safe side |
|
|
363 | $_->ready for @{ delete $LOCK{$key} }; |
|
|
364 | } |
|
|
365 | } |
369 | } |
366 | |
370 | |
367 | sub lock_active($) { |
371 | sub lock_active($) { |
368 | my ($key) = @_; |
372 | $LOCKS->count ($_[0]) < 1 |
369 | |
|
|
370 | ! ! $LOCK{$key} |
|
|
371 | } |
373 | } |
372 | |
374 | |
373 | sub freeze_mainloop { |
375 | sub freeze_mainloop { |
374 | tick_inhibit_inc; |
376 | tick_inhibit_inc; |
375 | |
377 | |
376 | Coro::guard \&tick_inhibit_dec; |
378 | &Guard::guard (\&tick_inhibit_dec); |
377 | } |
379 | } |
378 | |
380 | |
379 | =item cf::periodic $interval, $cb |
381 | =item cf::periodic $interval, $cb |
380 | |
382 | |
381 | Like EV::periodic, but randomly selects a starting point so that the actions |
383 | Like EV::periodic, but randomly selects a starting point so that the actions |
… | |
… | |
1153 | $decname, length $$rdata, scalar @$objs; |
1155 | $decname, length $$rdata, scalar @$objs; |
1154 | |
1156 | |
1155 | if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { |
1157 | if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { |
1156 | aio_chmod $fh, SAVE_MODE; |
1158 | aio_chmod $fh, SAVE_MODE; |
1157 | aio_write $fh, 0, (length $$rdata), $$rdata, 0; |
1159 | aio_write $fh, 0, (length $$rdata), $$rdata, 0; |
1158 | aio_fsync $fh if $cf::USE_FSYNC; |
1160 | if ($cf::USE_FSYNC) { |
|
|
1161 | aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER; |
|
|
1162 | aio_fsync $fh; |
|
|
1163 | } |
1159 | aio_close $fh; |
1164 | aio_close $fh; |
1160 | |
1165 | |
1161 | if (@$objs) { |
1166 | if (@$objs) { |
1162 | if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { |
1167 | if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { |
1163 | aio_chmod $fh, SAVE_MODE; |
1168 | aio_chmod $fh, SAVE_MODE; |
1164 | my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; |
1169 | my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; |
1165 | aio_write $fh, 0, (length $data), $data, 0; |
1170 | aio_write $fh, 0, (length $data), $data, 0; |
1166 | aio_fsync $fh if $cf::USE_FSYNC; |
1171 | if ($cf::USE_FSYNC) { |
|
|
1172 | aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER; |
|
|
1173 | aio_fsync $fh; |
|
|
1174 | } |
1167 | aio_close $fh; |
1175 | aio_close $fh; |
1168 | aio_rename "$filename.pst~", "$filename.pst"; |
1176 | aio_rename "$filename.pst~", "$filename.pst"; |
1169 | } |
1177 | } |
1170 | } else { |
1178 | } else { |
1171 | aio_unlink "$filename.pst"; |
1179 | aio_unlink "$filename.pst"; |
1172 | } |
1180 | } |
1173 | |
1181 | |
1174 | aio_rename "$filename~", $filename; |
1182 | aio_rename "$filename~", $filename; |
|
|
1183 | |
|
|
1184 | $filename =~ s%/[^/]+$%%; |
|
|
1185 | aio_pathsync $filename if $cf::USE_FSYNC; |
1175 | } else { |
1186 | } else { |
1176 | warn "FATAL: $filename~: $!\n"; |
1187 | warn "unable to save objects: $filename~: $!\n"; |
1177 | } |
1188 | } |
1178 | } else { |
1189 | } else { |
1179 | aio_unlink $filename; |
1190 | aio_unlink $filename; |
1180 | aio_unlink "$filename.pst"; |
1191 | aio_unlink "$filename.pst"; |
1181 | } |
1192 | } |
… | |
… | |
1272 | my ($name, $cb) = @_; |
1283 | my ($name, $cb) = @_; |
1273 | |
1284 | |
1274 | $EXTICMD{$name} = $cb; |
1285 | $EXTICMD{$name} = $cb; |
1275 | } |
1286 | } |
1276 | |
1287 | |
|
|
1288 | use File::Glob (); |
|
|
1289 | |
1277 | cf::player->attach ( |
1290 | cf::player->attach ( |
1278 | on_command => sub { |
1291 | on_command => sub { |
1279 | my ($pl, $name, $params) = @_; |
1292 | my ($pl, $name, $params) = @_; |
1280 | |
1293 | |
1281 | my $cb = $COMMAND{$name} |
1294 | my $cb = $COMMAND{$name} |
… | |
… | |
1312 | } |
1325 | } |
1313 | |
1326 | |
1314 | cf::override; |
1327 | cf::override; |
1315 | }, |
1328 | }, |
1316 | ); |
1329 | ); |
|
|
1330 | |
|
|
1331 | # "readahead" all extensions |
|
|
1332 | sub cache_extensions { |
|
|
1333 | my $grp = IO::AIO::aio_group; |
|
|
1334 | |
|
|
1335 | add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub { |
|
|
1336 | for (grep /\.ext$/, @{$_[0]}) { |
|
|
1337 | add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; |
|
|
1338 | } |
|
|
1339 | }; |
|
|
1340 | |
|
|
1341 | $grp |
|
|
1342 | } |
1317 | |
1343 | |
1318 | sub load_extensions { |
1344 | sub load_extensions { |
1319 | cf::sync_job { |
1345 | cf::sync_job { |
1320 | my %todo; |
1346 | my %todo; |
1321 | |
1347 | |
… | |
… | |
1444 | |
1470 | |
1445 | sub exists($) { |
1471 | sub exists($) { |
1446 | my ($login) = @_; |
1472 | my ($login) = @_; |
1447 | |
1473 | |
1448 | $cf::PLAYER{$login} |
1474 | $cf::PLAYER{$login} |
1449 | or cf::sync_job { !aio_stat path $login } |
1475 | or !aio_stat path $login |
1450 | } |
1476 | } |
1451 | |
1477 | |
1452 | sub find($) { |
1478 | sub find($) { |
1453 | return $cf::PLAYER{$_[0]} || do { |
1479 | return $cf::PLAYER{$_[0]} || do { |
1454 | my $login = $_[0]; |
1480 | my $login = $_[0]; |
… | |
… | |
1850 | |
1876 | |
1851 | (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; |
1877 | (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; |
1852 | "$UNIQUEDIR/$path" |
1878 | "$UNIQUEDIR/$path" |
1853 | } |
1879 | } |
1854 | |
1880 | |
1855 | # and all this just because we cannot iterate over |
|
|
1856 | # all maps in C++... |
|
|
1857 | sub change_all_map_light { |
|
|
1858 | my ($change) = @_; |
|
|
1859 | |
|
|
1860 | $_->change_map_light ($change) |
|
|
1861 | for grep $_->outdoor, values %cf::MAP; |
|
|
1862 | } |
|
|
1863 | |
|
|
1864 | sub decay_objects { |
1881 | sub decay_objects { |
1865 | my ($self) = @_; |
1882 | my ($self) = @_; |
1866 | |
1883 | |
1867 | return if $self->{deny_reset}; |
1884 | return if $self->{deny_reset}; |
1868 | |
1885 | |
… | |
… | |
1950 | sub find { |
1967 | sub find { |
1951 | my ($path, $origin) = @_; |
1968 | my ($path, $origin) = @_; |
1952 | |
1969 | |
1953 | $path = normalise $path, $origin && $origin->path; |
1970 | $path = normalise $path, $origin && $origin->path; |
1954 | |
1971 | |
1955 | cf::lock_wait "map_data:$path";#d#remove |
1972 | my $guard1 = cf::lock_acquire "map_data:$path";#d#remove |
1956 | cf::lock_wait "map_find:$path"; |
1973 | my $guard2 = cf::lock_acquire "map_find:$path"; |
1957 | |
1974 | |
1958 | $cf::MAP{$path} || do { |
1975 | $cf::MAP{$path} || do { |
1959 | my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it |
|
|
1960 | my $guard2 = cf::lock_acquire "map_find:$path"; |
|
|
1961 | |
|
|
1962 | my $map = new_from_path cf::map $path |
1976 | my $map = new_from_path cf::map $path |
1963 | or return; |
1977 | or return; |
1964 | |
1978 | |
1965 | $map->{last_save} = $cf::RUNTIME; |
1979 | $map->{last_save} = $cf::RUNTIME; |
1966 | |
1980 | |
… | |
… | |
2033 | |
2047 | |
2034 | unless ($self->{deny_activate}) { |
2048 | unless ($self->{deny_activate}) { |
2035 | $self->decay_objects; |
2049 | $self->decay_objects; |
2036 | $self->fix_auto_apply; |
2050 | $self->fix_auto_apply; |
2037 | $self->update_buttons; |
2051 | $self->update_buttons; |
2038 | cf::cede_to_tick; |
|
|
2039 | $self->set_darkness_map; |
|
|
2040 | cf::cede_to_tick; |
2052 | cf::cede_to_tick; |
2041 | $self->activate; |
2053 | $self->activate; |
2042 | } |
2054 | } |
2043 | |
2055 | |
2044 | $self->{last_save} = $cf::RUNTIME; |
2056 | $self->{last_save} = $cf::RUNTIME; |
… | |
… | |
2386 | |
2398 | |
2387 | our $SAY_CHANNEL = { |
2399 | our $SAY_CHANNEL = { |
2388 | id => "say", |
2400 | id => "say", |
2389 | title => "Map", |
2401 | title => "Map", |
2390 | reply => "say ", |
2402 | reply => "say ", |
2391 | tooltip => "Things said to and replied from npcs near you and other players on the same map only.", |
2403 | tooltip => "Things said to and replied from NPCs near you and other players on the same map only.", |
2392 | }; |
2404 | }; |
2393 | |
2405 | |
2394 | our $CHAT_CHANNEL = { |
2406 | our $CHAT_CHANNEL = { |
2395 | id => "chat", |
2407 | id => "chat", |
2396 | title => "Chat", |
2408 | title => "Chat", |
… | |
… | |
2771 | id => "infobox", |
2783 | id => "infobox", |
2772 | title => "Body Parts", |
2784 | title => "Body Parts", |
2773 | reply => undef, |
2785 | reply => undef, |
2774 | tooltip => "Shows which body parts you posess and are available", |
2786 | tooltip => "Shows which body parts you posess and are available", |
2775 | }, |
2787 | }, |
|
|
2788 | "c/statistics" => { |
|
|
2789 | id => "infobox", |
|
|
2790 | title => "Statistics", |
|
|
2791 | reply => undef, |
|
|
2792 | tooltip => "Shows your primary statistics", |
|
|
2793 | }, |
2776 | "c/skills" => { |
2794 | "c/skills" => { |
2777 | id => "infobox", |
2795 | id => "infobox", |
2778 | title => "Skills", |
2796 | title => "Skills", |
2779 | reply => undef, |
2797 | reply => undef, |
2780 | tooltip => "Shows your experience per skill and item power", |
2798 | tooltip => "Shows your experience per skill and item power", |
|
|
2799 | }, |
|
|
2800 | "c/shopitems" => { |
|
|
2801 | id => "infobox", |
|
|
2802 | title => "Shop Items", |
|
|
2803 | reply => undef, |
|
|
2804 | tooltip => "Shows the items currently for sale in this shop", |
|
|
2805 | }, |
|
|
2806 | "c/resistances" => { |
|
|
2807 | id => "infobox", |
|
|
2808 | title => "Resistances", |
|
|
2809 | reply => undef, |
|
|
2810 | tooltip => "Shows your resistances", |
|
|
2811 | }, |
|
|
2812 | "c/pets" => { |
|
|
2813 | id => "infobox", |
|
|
2814 | title => "Pets", |
|
|
2815 | reply => undef, |
|
|
2816 | tooltip => "Shows information abotu your pets/a specific pet", |
|
|
2817 | }, |
|
|
2818 | "c/perceiveself" => { |
|
|
2819 | id => "infobox", |
|
|
2820 | title => "Perceive Self", |
|
|
2821 | reply => undef, |
|
|
2822 | tooltip => "You gained detailed knowledge about yourself", |
2781 | }, |
2823 | }, |
2782 | "c/uptime" => { |
2824 | "c/uptime" => { |
2783 | id => "infobox", |
2825 | id => "infobox", |
2784 | title => "Uptime", |
2826 | title => "Uptime", |
2785 | reply => undef, |
2827 | reply => undef, |
… | |
… | |
2795 | id => "party", |
2837 | id => "party", |
2796 | title => "Party", |
2838 | title => "Party", |
2797 | reply => "gsay ", |
2839 | reply => "gsay ", |
2798 | tooltip => "Messages and chat related to your party", |
2840 | tooltip => "Messages and chat related to your party", |
2799 | }, |
2841 | }, |
|
|
2842 | "c/death" => { |
|
|
2843 | id => "death", |
|
|
2844 | title => "Death", |
|
|
2845 | reply => undef, |
|
|
2846 | tooltip => "Reason for and more info about your most recent death", |
|
|
2847 | }, |
|
|
2848 | "c/say" => $SAY_CHANNEL, |
|
|
2849 | "c/chat" => $CHAT_CHANNEL, |
2800 | ); |
2850 | ); |
2801 | |
2851 | |
2802 | sub cf::client::send_msg { |
2852 | sub cf::client::send_msg { |
2803 | my ($self, $channel, $msg, $color, @extra) = @_; |
2853 | my ($self, $channel, $msg, $color, @extra) = @_; |
2804 | |
2854 | |
… | |
… | |
2809 | |
2859 | |
2810 | # check predefined channels, for the benefit of C |
2860 | # check predefined channels, for the benefit of C |
2811 | if ($CHANNEL{$channel}) { |
2861 | if ($CHANNEL{$channel}) { |
2812 | $channel = $CHANNEL{$channel}; |
2862 | $channel = $CHANNEL{$channel}; |
2813 | |
2863 | |
2814 | $self->ext_msg (channel_info => $channel) |
2864 | $self->ext_msg (channel_info => $channel); |
2815 | if $self->can_msg; |
|
|
2816 | |
|
|
2817 | $channel = $channel->{id}; |
2865 | $channel = $channel->{id}; |
2818 | |
2866 | |
2819 | } elsif (ref $channel) { |
2867 | } elsif (ref $channel) { |
2820 | # send meta info to client, if not yet sent |
2868 | # send meta info to client, if not yet sent |
2821 | unless (exists $self->{channel}{$channel->{id}}) { |
2869 | unless (exists $self->{channel}{$channel->{id}}) { |
2822 | $self->{channel}{$channel->{id}} = $channel; |
2870 | $self->{channel}{$channel->{id}} = $channel; |
2823 | $self->ext_msg (channel_info => $channel) |
2871 | $self->ext_msg (channel_info => $channel); |
2824 | if $self->can_msg; |
|
|
2825 | } |
2872 | } |
2826 | |
2873 | |
2827 | $channel = $channel->{id}; |
2874 | $channel = $channel->{id}; |
2828 | } |
2875 | } |
2829 | |
2876 | |
2830 | return unless @extra || length $msg; |
2877 | return unless @extra || length $msg; |
2831 | |
2878 | |
2832 | if ($self->can_msg) { |
|
|
2833 | # default colour, mask it out |
2879 | # default colour, mask it out |
2834 | $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) |
2880 | $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) |
2835 | if $color & cf::NDI_DEF; |
2881 | if $color & cf::NDI_DEF; |
2836 | |
2882 | |
2837 | my $pkt = "msg " |
2883 | my $pkt = "msg " |
2838 | . $self->{json_coder}->encode ( |
2884 | . $self->{json_coder}->encode ( |
2839 | [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] |
2885 | [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] |
2840 | ); |
2886 | ); |
2841 | |
2887 | |
2842 | # try lzf for large packets |
2888 | # try lzf for large packets |
2843 | $pkt = "lzf " . Compress::LZF::compress $pkt |
2889 | $pkt = "lzf " . Compress::LZF::compress $pkt |
2844 | if 1024 <= length $pkt and $self->{can_lzf}; |
2890 | if 1024 <= length $pkt and $self->{can_lzf}; |
2845 | |
2891 | |
2846 | # split very large packets |
2892 | # split very large packets |
2847 | if (8192 < length $pkt and $self->{can_lzf}) { |
2893 | if (8192 < length $pkt and $self->{can_lzf}) { |
2848 | $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; |
2894 | $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; |
2849 | $pkt = "frag"; |
2895 | $pkt = "frag"; |
2850 | } |
2896 | } |
2851 | |
2897 | |
2852 | $self->send_packet ($pkt); |
2898 | $self->send_packet ($pkt); |
2853 | } else { |
|
|
2854 | if ($color >= 0) { |
|
|
2855 | # replace some tags by gcfclient-compatible ones |
|
|
2856 | for ($msg) { |
|
|
2857 | 1 while |
|
|
2858 | s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ |
|
|
2859 | || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/ |
|
|
2860 | || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/ |
|
|
2861 | || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/ |
|
|
2862 | || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/; |
|
|
2863 | } |
|
|
2864 | |
|
|
2865 | $color &= cf::NDI_COLOR_MASK; |
|
|
2866 | |
|
|
2867 | utf8::encode $msg; |
|
|
2868 | |
|
|
2869 | if (0 && $msg =~ /\[/) { |
|
|
2870 | # COMMAND/INFO |
|
|
2871 | $self->send_packet ("drawextinfo $color 10 8 $msg") |
|
|
2872 | } else { |
|
|
2873 | $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; |
|
|
2874 | $self->send_packet ("drawinfo $color $msg") |
|
|
2875 | } |
|
|
2876 | } |
|
|
2877 | } |
|
|
2878 | } |
2899 | } |
2879 | |
2900 | |
2880 | =item $client->ext_msg ($type, @msg) |
2901 | =item $client->ext_msg ($type, @msg) |
2881 | |
2902 | |
2882 | Sends an ext event to the client. |
2903 | Sends an ext event to the client. |
… | |
… | |
3057 | The following functions and methods are available within a safe environment: |
3078 | The following functions and methods are available within a safe environment: |
3058 | |
3079 | |
3059 | cf::object |
3080 | cf::object |
3060 | contr pay_amount pay_player map x y force_find force_add destroy |
3081 | contr pay_amount pay_player map x y force_find force_add destroy |
3061 | insert remove name archname title slaying race decrease split |
3082 | insert remove name archname title slaying race decrease split |
|
|
3083 | value |
3062 | |
3084 | |
3063 | cf::object::player |
3085 | cf::object::player |
3064 | player |
3086 | player |
3065 | |
3087 | |
3066 | cf::player |
3088 | cf::player |
… | |
… | |
3072 | =cut |
3094 | =cut |
3073 | |
3095 | |
3074 | for ( |
3096 | for ( |
3075 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
3097 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
3076 | insert remove inv nrof name archname title slaying race |
3098 | insert remove inv nrof name archname title slaying race |
3077 | decrease split destroy change_exp)], |
3099 | decrease split destroy change_exp value msg lore send_msg)], |
3078 | ["cf::object::player" => qw(player)], |
3100 | ["cf::object::player" => qw(player)], |
3079 | ["cf::player" => qw(peaceful)], |
3101 | ["cf::player" => qw(peaceful send_msg)], |
3080 | ["cf::map" => qw(trigger)], |
3102 | ["cf::map" => qw(trigger)], |
3081 | ) { |
3103 | ) { |
3082 | no strict 'refs'; |
3104 | no strict 'refs'; |
3083 | my ($pkg, @funs) = @$_; |
3105 | my ($pkg, @funs) = @$_; |
3084 | *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) |
3106 | *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) |
… | |
… | |
3101 | my ($code, %vars) = @_; |
3123 | my ($code, %vars) = @_; |
3102 | |
3124 | |
3103 | my $qcode = $code; |
3125 | my $qcode = $code; |
3104 | $qcode =~ s/"/‟/g; # not allowed in #line filenames |
3126 | $qcode =~ s/"/‟/g; # not allowed in #line filenames |
3105 | $qcode =~ s/\n/\\n/g; |
3127 | $qcode =~ s/\n/\\n/g; |
|
|
3128 | |
|
|
3129 | %vars = (_dummy => 0) unless %vars; |
3106 | |
3130 | |
3107 | local $_; |
3131 | local $_; |
3108 | local @safe::cf::_safe_eval_args = values %vars; |
3132 | local @safe::cf::_safe_eval_args = values %vars; |
3109 | |
3133 | |
3110 | my $eval = |
3134 | my $eval = |
… | |
… | |
3340 | reload_treasures; |
3364 | reload_treasures; |
3341 | |
3365 | |
3342 | warn "finished reloading resource files\n"; |
3366 | warn "finished reloading resource files\n"; |
3343 | } |
3367 | } |
3344 | |
3368 | |
3345 | sub init { |
|
|
3346 | my $guard = freeze_mainloop; |
|
|
3347 | |
|
|
3348 | evthread_start IO::AIO::poll_fileno; |
|
|
3349 | |
|
|
3350 | reload_resources; |
|
|
3351 | } |
|
|
3352 | |
|
|
3353 | sub reload_config { |
3369 | sub reload_config { |
3354 | open my $fh, "<:utf8", "$CONFDIR/config" |
3370 | open my $fh, "<:utf8", "$CONFDIR/config" |
3355 | or return; |
3371 | or return; |
3356 | |
3372 | |
3357 | local $/; |
3373 | local $/; |
… | |
… | |
3388 | |
3404 | |
3389 | seek $fh, 0, 0; |
3405 | seek $fh, 0, 0; |
3390 | print $fh $$; |
3406 | print $fh $$; |
3391 | } |
3407 | } |
3392 | |
3408 | |
|
|
3409 | sub main_loop { |
|
|
3410 | warn "EV::loop starting\n"; |
|
|
3411 | if (1) { |
|
|
3412 | EV::loop; |
|
|
3413 | } |
|
|
3414 | warn "EV::loop returned\n"; |
|
|
3415 | goto &main_loop unless $REALLY_UNLOOP; |
|
|
3416 | } |
|
|
3417 | |
3393 | sub main { |
3418 | sub main { |
3394 | atomic; |
3419 | cf::init_globals; # initialise logging |
|
|
3420 | |
|
|
3421 | LOG llevInfo, "Welcome to Deliantra, v" . VERSION; |
|
|
3422 | LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; |
|
|
3423 | LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; |
|
|
3424 | LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; |
|
|
3425 | |
|
|
3426 | cf::init_experience; |
|
|
3427 | cf::init_anim; |
|
|
3428 | cf::init_attackmess; |
|
|
3429 | cf::init_dynamic; |
|
|
3430 | |
|
|
3431 | $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority |
3395 | |
3432 | |
3396 | # we must not ever block the main coroutine |
3433 | # we must not ever block the main coroutine |
3397 | local $Coro::idle = sub { |
3434 | local $Coro::idle = sub { |
3398 | Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# |
3435 | Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# |
3399 | (async { |
3436 | (async { |
3400 | $Coro::current->{desc} = "IDLE BUG HANDLER"; |
3437 | $Coro::current->{desc} = "IDLE BUG HANDLER"; |
3401 | EV::loop EV::LOOP_ONESHOT; |
3438 | EV::loop EV::LOOP_ONESHOT; |
3402 | })->prio (Coro::PRIO_MAX); |
3439 | })->prio (Coro::PRIO_MAX); |
3403 | }; |
3440 | }; |
3404 | |
3441 | |
3405 | { |
3442 | evthread_start IO::AIO::poll_fileno; |
3406 | my $guard = freeze_mainloop; |
3443 | |
|
|
3444 | cf::sync_job { |
|
|
3445 | reload_resources; |
3407 | reload_config; |
3446 | reload_config; |
3408 | db_init; |
3447 | db_init; |
|
|
3448 | |
|
|
3449 | cf::load_settings; |
|
|
3450 | cf::load_materials; |
|
|
3451 | cf::init_uuid; |
|
|
3452 | cf::init_signals; |
|
|
3453 | cf::init_commands; |
|
|
3454 | cf::init_skills; |
|
|
3455 | |
|
|
3456 | cf::init_beforeplay; |
|
|
3457 | |
|
|
3458 | atomic; |
|
|
3459 | |
3409 | load_extensions; |
3460 | load_extensions; |
3410 | |
3461 | |
3411 | $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority |
|
|
3412 | } |
|
|
3413 | |
|
|
3414 | utime time, time, $RUNTIMEFILE; |
3462 | utime time, time, $RUNTIMEFILE; |
3415 | |
3463 | |
3416 | # no (long-running) fork's whatsoever before this point(!) |
3464 | # no (long-running) fork's whatsoever before this point(!) |
3417 | POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; |
3465 | POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; |
3418 | |
3466 | |
3419 | EV::loop; |
3467 | (pop @POST_INIT)->(0) while @POST_INIT; |
|
|
3468 | }; |
|
|
3469 | |
|
|
3470 | main_loop; |
3420 | } |
3471 | } |
3421 | |
3472 | |
3422 | ############################################################################# |
3473 | ############################################################################# |
3423 | # initialisation and cleanup |
3474 | # initialisation and cleanup |
3424 | |
3475 | |
… | |
… | |
3480 | my $uuid = "$LOCALDIR/uuid"; |
3531 | my $uuid = "$LOCALDIR/uuid"; |
3481 | |
3532 | |
3482 | my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 |
3533 | my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 |
3483 | or return; |
3534 | or return; |
3484 | |
3535 | |
3485 | my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; |
3536 | my $value = uuid_seq uuid_cur; |
|
|
3537 | |
|
|
3538 | unless ($value) { |
|
|
3539 | warn "cowardly refusing to write zero uuid value!\n"; |
|
|
3540 | return; |
|
|
3541 | } |
|
|
3542 | |
|
|
3543 | my $value = uuid_str $value + $uuid_skip; |
3486 | $uuid_skip = 0; |
3544 | $uuid_skip = 0; |
3487 | |
3545 | |
3488 | (aio_write $fh, 0, (length $value), $value, 0) <= 0 |
3546 | (aio_write $fh, 0, (length $value), $value, 0) <= 0 |
3489 | and return; |
3547 | and return; |
3490 | |
3548 | |
… | |
… | |
3512 | } |
3570 | } |
3513 | |
3571 | |
3514 | sub emergency_save() { |
3572 | sub emergency_save() { |
3515 | my $freeze_guard = cf::freeze_mainloop; |
3573 | my $freeze_guard = cf::freeze_mainloop; |
3516 | |
3574 | |
3517 | warn "enter emergency perl save\n"; |
3575 | warn "emergency_perl_save: enter\n"; |
3518 | |
3576 | |
3519 | cf::sync_job { |
3577 | cf::sync_job { |
|
|
3578 | # this is a trade-off: we want to be very quick here, so |
|
|
3579 | # save all maps without fsync, and later call a global sync |
|
|
3580 | # (which in turn might be very very slow) |
|
|
3581 | local $USE_FSYNC = 0; |
|
|
3582 | |
3520 | # use a peculiar iteration method to avoid tripping on perl |
3583 | # use a peculiar iteration method to avoid tripping on perl |
3521 | # refcount bugs in for. also avoids problems with players |
3584 | # refcount bugs in for. also avoids problems with players |
3522 | # and maps saved/destroyed asynchronously. |
3585 | # and maps saved/destroyed asynchronously. |
3523 | warn "begin emergency player save\n"; |
3586 | warn "emergency_perl_save: begin player save\n"; |
3524 | for my $login (keys %cf::PLAYER) { |
3587 | for my $login (keys %cf::PLAYER) { |
3525 | my $pl = $cf::PLAYER{$login} or next; |
3588 | my $pl = $cf::PLAYER{$login} or next; |
3526 | $pl->valid or next; |
3589 | $pl->valid or next; |
3527 | delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt |
3590 | delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt |
3528 | $pl->save; |
3591 | $pl->save; |
3529 | } |
3592 | } |
3530 | warn "end emergency player save\n"; |
3593 | warn "emergency_perl_save: end player save\n"; |
3531 | |
3594 | |
3532 | warn "begin emergency map save\n"; |
3595 | warn "emergency_perl_save: begin map save\n"; |
3533 | for my $path (keys %cf::MAP) { |
3596 | for my $path (keys %cf::MAP) { |
3534 | my $map = $cf::MAP{$path} or next; |
3597 | my $map = $cf::MAP{$path} or next; |
3535 | $map->valid or next; |
3598 | $map->valid or next; |
3536 | $map->save; |
3599 | $map->save; |
3537 | } |
3600 | } |
3538 | warn "end emergency map save\n"; |
3601 | warn "emergency_perl_save: end map save\n"; |
3539 | |
3602 | |
3540 | warn "begin emergency database checkpoint\n"; |
3603 | warn "emergency_perl_save: begin database checkpoint\n"; |
3541 | BDB::db_env_txn_checkpoint $DB_ENV; |
3604 | BDB::db_env_txn_checkpoint $DB_ENV; |
3542 | warn "end emergency database checkpoint\n"; |
3605 | warn "emergency_perl_save: end database checkpoint\n"; |
3543 | |
3606 | |
3544 | warn "begin write uuid\n"; |
3607 | warn "emergency_perl_save: begin write uuid\n"; |
3545 | write_uuid_sync 1; |
3608 | write_uuid_sync 1; |
3546 | warn "end write uuid\n"; |
3609 | warn "emergency_perl_save: end write uuid\n"; |
3547 | }; |
3610 | }; |
3548 | |
3611 | |
|
|
3612 | warn "emergency_perl_save: starting sync()\n"; |
|
|
3613 | IO::AIO::aio_sync sub { |
|
|
3614 | warn "emergency_perl_save: finished sync()\n"; |
|
|
3615 | }; |
|
|
3616 | |
3549 | warn "leave emergency perl save\n"; |
3617 | warn "emergency_perl_save: leave\n"; |
3550 | } |
3618 | } |
3551 | |
3619 | |
3552 | sub post_cleanup { |
3620 | sub post_cleanup { |
3553 | my ($make_core) = @_; |
3621 | my ($make_core) = @_; |
3554 | |
3622 | |
… | |
… | |
3580 | my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; |
3648 | my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; |
3581 | for my $name (keys %$leaf_symtab) { |
3649 | for my $name (keys %$leaf_symtab) { |
3582 | _gv_clear *{"$pkg$name"}; |
3650 | _gv_clear *{"$pkg$name"}; |
3583 | # use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; |
3651 | # use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; |
3584 | } |
3652 | } |
3585 | warn "cleared package #$pkg\n";#d# |
3653 | warn "cleared package $pkg\n";#d# |
3586 | } |
3654 | } |
3587 | |
|
|
3588 | our $RELOAD; # how many times to reload |
|
|
3589 | |
3655 | |
3590 | sub do_reload_perl() { |
3656 | sub do_reload_perl() { |
3591 | # can/must only be called in main |
3657 | # can/must only be called in main |
3592 | if ($Coro::current != $Coro::main) { |
3658 | if ($Coro::current != $Coro::main) { |
3593 | warn "can only reload from main coroutine"; |
3659 | warn "can only reload from main coroutine"; |
3594 | return; |
3660 | return; |
3595 | } |
3661 | } |
3596 | |
3662 | |
3597 | return if $RELOAD++; |
3663 | return if $RELOAD++; |
|
|
3664 | |
|
|
3665 | my $t1 = EV::time; |
3598 | |
3666 | |
3599 | while ($RELOAD) { |
3667 | while ($RELOAD) { |
3600 | warn "reloading..."; |
3668 | warn "reloading..."; |
3601 | |
3669 | |
3602 | warn "entering sync_job"; |
3670 | warn "entering sync_job"; |
… | |
… | |
3663 | clear_package "safe::$_" |
3731 | clear_package "safe::$_" |
3664 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
3732 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
3665 | |
3733 | |
3666 | warn "unloading cf.pm \"a bit\""; |
3734 | warn "unloading cf.pm \"a bit\""; |
3667 | delete $INC{"cf.pm"}; |
3735 | delete $INC{"cf.pm"}; |
3668 | delete $INC{"cf/pod.pm"}; |
3736 | delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; |
3669 | |
3737 | |
3670 | # don't, removes xs symbols, too, |
3738 | # don't, removes xs symbols, too, |
3671 | # and global variables created in xs |
3739 | # and global variables created in xs |
3672 | #clear_package __PACKAGE__; |
3740 | #clear_package __PACKAGE__; |
3673 | |
3741 | |
… | |
… | |
3681 | cf::reload_config; |
3749 | cf::reload_config; |
3682 | |
3750 | |
3683 | warn "loading extensions"; |
3751 | warn "loading extensions"; |
3684 | cf::load_extensions; |
3752 | cf::load_extensions; |
3685 | |
3753 | |
|
|
3754 | if ($REATTACH_ON_RELOAD) { |
3686 | warn "reattaching attachments to objects/players"; |
3755 | warn "reattaching attachments to objects/players"; |
3687 | _global_reattach; # objects, sockets |
3756 | _global_reattach; # objects, sockets |
3688 | warn "reattaching attachments to maps"; |
3757 | warn "reattaching attachments to maps"; |
3689 | reattach $_ for values %MAP; |
3758 | reattach $_ for values %MAP; |
3690 | warn "reattaching attachments to players"; |
3759 | warn "reattaching attachments to players"; |
3691 | reattach $_ for values %PLAYER; |
3760 | reattach $_ for values %PLAYER; |
|
|
3761 | } |
|
|
3762 | |
|
|
3763 | warn "running post_init jobs"; |
|
|
3764 | (pop @POST_INIT)->(1) while @POST_INIT; |
3692 | |
3765 | |
3693 | warn "leaving sync_job"; |
3766 | warn "leaving sync_job"; |
3694 | |
3767 | |
3695 | 1 |
3768 | 1 |
3696 | } or do { |
3769 | } or do { |
… | |
… | |
3699 | }; |
3772 | }; |
3700 | |
3773 | |
3701 | warn "reloaded"; |
3774 | warn "reloaded"; |
3702 | --$RELOAD; |
3775 | --$RELOAD; |
3703 | } |
3776 | } |
|
|
3777 | |
|
|
3778 | $t1 = EV::time - $t1; |
|
|
3779 | warn "reload completed in ${t1}s\n"; |
3704 | }; |
3780 | }; |
3705 | |
3781 | |
3706 | our $RELOAD_WATCHER; # used only during reload |
3782 | our $RELOAD_WATCHER; # used only during reload |
3707 | |
3783 | |
3708 | sub reload_perl() { |
3784 | sub reload_perl() { |
3709 | # doing reload synchronously and two reloads happen back-to-back, |
3785 | # doing reload synchronously and two reloads happen back-to-back, |
3710 | # coro crashes during coro_state_free->destroy here. |
3786 | # coro crashes during coro_state_free->destroy here. |
3711 | |
3787 | |
|
|
3788 | $RELOAD_WATCHER ||= cf::async { |
|
|
3789 | Coro::AIO::aio_wait cache_extensions; |
|
|
3790 | |
3712 | $RELOAD_WATCHER ||= EV::timer 0, 0, sub { |
3791 | $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { |
3713 | do_reload_perl; |
3792 | do_reload_perl; |
3714 | undef $RELOAD_WATCHER; |
3793 | undef $RELOAD_WATCHER; |
|
|
3794 | }; |
3715 | }; |
3795 | }; |
3716 | } |
3796 | } |
3717 | |
3797 | |
3718 | register_command "reload" => sub { |
3798 | register_command "reload" => sub { |
3719 | my ($who, $arg) = @_; |
3799 | my ($who, $arg) = @_; |
… | |
… | |
3878 | LOG llevInfo, "[ABT] [suppressed]\n"; |
3958 | LOG llevInfo, "[ABT] [suppressed]\n"; |
3879 | } |
3959 | } |
3880 | } |
3960 | } |
3881 | |
3961 | |
3882 | # load additional modules |
3962 | # load additional modules |
3883 | use cf::pod; |
3963 | require "cf/$_.pm" for @EXTRA_MODULES; |
3884 | |
3964 | |
3885 | END { cf::emergency_save } |
3965 | END { cf::emergency_save } |
3886 | |
3966 | |
3887 | 1 |
3967 | 1 |
3888 | |
3968 | |