ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.450 by root, Mon Sep 22 01:33:09 2008 UTC vs.
Revision 1.511 by root, Wed Apr 7 18:35:56 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
39use Guard ();
37use Coro (); 40use Coro ();
38use Coro::State; 41use Coro::State;
39use Coro::Handle; 42use Coro::Handle;
40use Coro::EV; 43use Coro::EV;
41use Coro::AnyEvent; 44use Coro::AnyEvent;
42use Coro::Timer; 45use Coro::Timer;
43use Coro::Signal; 46use Coro::Signal;
44use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
45use Coro::AnyEvent; 49use Coro::AnyEvent;
46use Coro::AIO; 50use Coro::AIO;
47use Coro::BDB 1.6; 51use Coro::BDB 1.6;
48use Coro::Storable; 52use Coro::Storable;
49use Coro::Util (); 53use Coro::Util ();
50 54
51use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
52use BDB (); 56use BDB ();
53use Data::Dumper; 57use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 58use Fcntl;
56use YAML (); 59use YAML::XS ();
57use IO::AIO (); 60use IO::AIO ();
58use Time::HiRes; 61use Time::HiRes;
59use Compress::LZF; 62use Compress::LZF;
60use Digest::MD5 (); 63use Digest::MD5 ();
61 64
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70 73
71# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
74 80
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
76 82
77our %COMMAND = (); 83our %COMMAND = ();
78our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
81our %EXTCMD = (); 87our %EXTCMD = ();
82our %EXTICMD = (); 88our %EXTICMD = ();
83our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
85 91
86our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
88 96
89our $CONFDIR = confdir; 97our $CONFDIR = confdir;
90our $DATADIR = datadir; 98our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
103our %RESOURCE; 111our %RESOURCE;
104 112
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 115our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
109 117
110our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 121our $DB_ENV;
114 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
115our %CFG; 125our %CFG;
116 126
117our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 128our $RUNTIME;
119our $NOW; 129our $NOW;
127 137
128our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
129our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 140our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
132 147
133binmode STDOUT; 148binmode STDOUT;
134binmode STDERR; 149binmode STDERR;
135 150
136# read virtual server time, if available 151# read virtual server time, if available
138 open my $fh, "<", $RUNTIMEFILE 153 open my $fh, "<", $RUNTIMEFILE
139 or die "unable to read $RUNTIMEFILE file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
140 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
141} 156}
142 157
158eval "sub TICK() { $TICK } 1" or die;
159
143mkdir $_ 160mkdir $_
144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
145 162
146our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
147 164
148sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
149 177
150############################################################################# 178#############################################################################
151 179
152=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
153 181
200returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
201per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
202 230
203=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
204 232
205This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
206C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
207that call. 235that call.
208 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
209=back 243=back
210 244
211=cut 245=cut
212 246
213BEGIN { 247$Coro::State::WARNHOOK = sub {
214 *CORE::GLOBAL::warn = sub {
215 my $msg = join "", @_; 248 my $msg = join "", @_;
216 249
217 $msg .= "\n" 250 $msg .= "\n"
218 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
219 252
220 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
221 254
222 LOG llevError, $msg; 255 LOG llevError, $msg;
223 }; 256};
224}
225 257
226$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
228 262
229 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d# 265 return;#d#
232 }#d# 266 }#d#
233 267
234 # kill coroutine otherwise 268 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate 269 Coro::terminate
237}; 270};
238
239$SIG{__DIE__} = sub { }; #d#?
240 271
241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
258)) { 289)) {
259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
260} 291}
261 292
262$EV::DIED = sub { 293$EV::DIED = sub {
263 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
264}; 295};
265 296
266############################################################################# 297#############################################################################
267 298
268=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
305our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
306 337
307sub encode_json($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
309 340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
354
310=item cf::lock_wait $string 355=item cf::lock_wait $string
311 356
312Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
313 358
314=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
315 360
316Wait until the given lock is available and then acquires it and returns 361Wait until the given lock is available and then acquires it and returns
317a Coro::guard object. If the guard object gets destroyed (goes out of scope, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
318for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
319returned. 364returned.
320 365
321Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
322deadlocked coro. 367deadlocked coro.
328 373
329Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
330 375
331=cut 376=cut
332 377
333our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 379
336sub lock_wait($) { 380sub lock_wait($) {
337 my ($key) = @_; 381 $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} 382}
350 383
351sub lock_acquire($) { 384sub lock_acquire($) {
352 my ($key) = @_; 385 $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} 386}
366 387
367sub lock_active($) { 388sub lock_active($) {
368 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
369
370 ! ! $LOCK{$key}
371} 390}
372 391
373sub freeze_mainloop { 392sub freeze_mainloop {
374 tick_inhibit_inc; 393 tick_inhibit_inc;
375 394
376 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
377} 396}
378 397
379=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
380 399
381Like EV::periodic, but randomly selects a starting point so that the actions 400Like EV::periodic, but randomly selects a starting point so that the actions
404 423
405=cut 424=cut
406 425
407our @SLOT_QUEUE; 426our @SLOT_QUEUE;
408our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
409 429
410$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
411$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
412 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
413 433
414 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
415 436
416 while () { 437 while () {
417 next_job: 438 next_job:
439
418 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
419 if ($avail > 0.01) { 441
420 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
421 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
422 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
423 $job->[2]->send; 446 $job->[2]->send;
424 Coro::cede; 447 Coro::cede;
425 goto next_job; 448 goto next_job;
426 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
427 } 451 }
428 } 452 }
429 453
430 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
431 # we do not use wait_for_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
432 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
433 $signal->wait; 457 $signal->wait;
434 } else { 458 } else {
459 $busy = 0;
435 Coro::schedule; 460 Coro::schedule;
436 } 461 }
437 } 462 }
438}; 463};
439 464
440sub get_slot($;$$) { 465sub get_slot($;$$) {
441 return if tick_inhibit || $Coro::current == $Coro::main; 466 return if tick_inhibit || $Coro::current == $Coro::main;
442 467
443 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
444 469
445 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
446 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
447 473
448 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
449 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
450 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
1153 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1154 1180
1155 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1156 aio_chmod $fh, SAVE_MODE; 1182 aio_chmod $fh, SAVE_MODE;
1157 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1158 aio_fsync $fh if $cf::USE_FSYNC; 1184 if ($cf::USE_FSYNC) {
1185 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;
1186 aio_fsync $fh;
1187 }
1159 aio_close $fh; 1188 aio_close $fh;
1160 1189
1161 if (@$objs) { 1190 if (@$objs) {
1162 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1191 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1163 aio_chmod $fh, SAVE_MODE; 1192 aio_chmod $fh, SAVE_MODE;
1164 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1165 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1166 aio_fsync $fh if $cf::USE_FSYNC; 1195 if ($cf::USE_FSYNC) {
1196 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;
1197 aio_fsync $fh;
1198 }
1167 aio_close $fh; 1199 aio_close $fh;
1168 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1169 } 1201 }
1170 } else { 1202 } else {
1171 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1172 } 1204 }
1173 1205
1174 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1175 } else { 1210 } else {
1176 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1177 } 1212 }
1178 } else { 1213 } else {
1179 aio_unlink $filename; 1214 aio_unlink $filename;
1180 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1181 } 1216 }
1272 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1273 1308
1274 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1275} 1310}
1276 1311
1312use File::Glob ();
1313
1277cf::player->attach ( 1314cf::player->attach (
1278 on_command => sub { 1315 on_unknown_command => sub {
1279 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1280 1317
1281 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1282 or return; 1319 or return;
1283 1320
1313 1350
1314 cf::override; 1351 cf::override;
1315 }, 1352 },
1316); 1353);
1317 1354
1355# "readahead" all extensions
1356sub cache_extensions {
1357 my $grp = IO::AIO::aio_group;
1358
1359 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1360 for (grep /\.ext$/, @{$_[0]}) {
1361 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1362 }
1363 };
1364
1365 $grp
1366}
1367
1318sub load_extensions { 1368sub load_extensions {
1319 cf::sync_job { 1369 cf::sync_job {
1320 my %todo; 1370 my %todo;
1321 1371
1322 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
1349 . "\n};\n1"; 1399 . "\n};\n1";
1350 1400
1351 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1352 } 1402 }
1353 1403
1404 my $pass = 0;
1354 my %done; 1405 my %done;
1355 while (%todo) { 1406 while (%todo) {
1356 my $progress; 1407 my $progress;
1357 1408
1409 ++$pass;
1410
1411 ext:
1358 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1359 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1360 goto skip 1414 next ext
1361 unless exists $done{$_}; 1415 unless exists $done{$_};
1362 } 1416 }
1363 1417
1364 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1365 1419
1366 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1367 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1368 : "$v->{base}: extension inactive.\n";
1369 1424
1370 if (exists $v->{meta}{mandatory}) {
1371 warn $msg;
1372 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1373 } 1426 if exists $v->{meta}{mandatory};
1374 1427 } else {
1375 warn $msg; 1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431
1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1376 } 1434 }
1377
1378 $done{$k} = delete $todo{$k};
1379 push @EXTS, $v->{pkg};
1380 $progress = 1;
1381 } 1435 }
1382 1436
1383 skip: 1437 unless ($progress) {
1384 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1385 unless $progress; 1439
1440 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory};
1443 }
1444 }
1386 } 1445 }
1387 }; 1446 };
1388} 1447}
1389 1448
1390############################################################################# 1449#############################################################################
1444 1503
1445sub exists($) { 1504sub exists($) {
1446 my ($login) = @_; 1505 my ($login) = @_;
1447 1506
1448 $cf::PLAYER{$login} 1507 $cf::PLAYER{$login}
1449 or cf::sync_job { !aio_stat path $login } 1508 or !aio_stat path $login
1450} 1509}
1451 1510
1452sub find($) { 1511sub find($) {
1453 return $cf::PLAYER{$_[0]} || do { 1512 return $cf::PLAYER{$_[0]} || do {
1454 my $login = $_[0]; 1513 my $login = $_[0];
1474 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1475 } 1534 }
1476 } 1535 }
1477} 1536}
1478 1537
1538cf::player->attach (
1539 on_load => sub {
1540 my ($pl, $path) = @_;
1541
1542 # restore slots saved in save, below
1543 my $slots = delete $pl->{_slots};
1544
1545 $pl->ob->current_weapon ($slots->[0]);
1546 $pl->combat_ob ($slots->[1]);
1547 $pl->ranged_ob ($slots->[2]);
1548 },
1549);
1550
1479sub save($) { 1551sub save($) {
1480 my ($pl) = @_; 1552 my ($pl) = @_;
1481 1553
1482 return if $pl->{deny_save}; 1554 return if $pl->{deny_save};
1483 1555
1488 1560
1489 aio_mkdir playerdir $pl, 0770; 1561 aio_mkdir playerdir $pl, 0770;
1490 $pl->{last_save} = $cf::RUNTIME; 1562 $pl->{last_save} = $cf::RUNTIME;
1491 1563
1492 cf::get_slot 0.01; 1564 cf::get_slot 0.01;
1565
1566 # save slots, to be restored later
1567 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1493 1568
1494 $pl->save_pl ($path); 1569 $pl->save_pl ($path);
1495 cf::cede_to_tick; 1570 cf::cede_to_tick;
1496} 1571}
1497 1572
1710 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1711 1786
1712 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1713 $self->_create_random_map ( 1788 $self->_create_random_map (
1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1717 $rmp->{exit_on_final_map}, 1792 $rmp->{exit_on_final_map},
1718 $rmp->{xsize}, $rmp->{ysize}, 1793 $rmp->{xsize}, $rmp->{ysize},
1719 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1720 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1850 1925
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1853} 1928}
1854 1929
1855# and all this just because we cannot iterate over
1856# all maps in C++...
1857sub change_all_map_light {
1858 my ($change) = @_;
1859
1860 $_->change_map_light ($change)
1861 for grep $_->outdoor, values %cf::MAP;
1862}
1863
1864sub decay_objects { 1930sub decay_objects {
1865 my ($self) = @_; 1931 my ($self) = @_;
1866 1932
1867 return if $self->{deny_reset}; 1933 return if $self->{deny_reset};
1868 1934
1950sub find { 2016sub find {
1951 my ($path, $origin) = @_; 2017 my ($path, $origin) = @_;
1952 2018
1953 $path = normalise $path, $origin && $origin->path; 2019 $path = normalise $path, $origin && $origin->path;
1954 2020
1955 cf::lock_wait "map_data:$path";#d#remove 2021 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 2022 my $guard2 = cf::lock_acquire "map_find:$path";
1957 2023
1958 $cf::MAP{$path} || do { 2024 $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 2025 my $map = new_from_path cf::map $path
1963 or return; 2026 or return;
1964 2027
1965 $map->{last_save} = $cf::RUNTIME; 2028 $map->{last_save} = $cf::RUNTIME;
1966 2029
1978 2041
1979 $cf::MAP{$path} = $map 2042 $cf::MAP{$path} = $map
1980 } 2043 }
1981} 2044}
1982 2045
1983sub pre_load { } 2046sub pre_load { }
1984sub post_load { } 2047#sub post_load { } # XS
1985 2048
1986sub load { 2049sub load {
1987 my ($self) = @_; 2050 my ($self) = @_;
1988 2051
1989 local $self->{deny_reset} = 1; # loading can take a long time 2052 local $self->{deny_reset} = 1; # loading can take a long time
2034 unless ($self->{deny_activate}) { 2097 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2098 $self->decay_objects;
2036 $self->fix_auto_apply; 2099 $self->fix_auto_apply;
2037 $self->update_buttons; 2100 $self->update_buttons;
2038 cf::cede_to_tick; 2101 cf::cede_to_tick;
2039 $self->set_darkness_map;
2040 cf::cede_to_tick;
2041 $self->activate; 2102 $self->activate;
2042 } 2103 }
2043 2104
2044 $self->{last_save} = $cf::RUNTIME; 2105 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2106 $self->last_access ($cf::RUNTIME);
2048 } 2109 }
2049 2110
2050 $self->post_load; 2111 $self->post_load;
2051} 2112}
2052 2113
2114# customize the map for a given player, i.e.
2115# return the _real_ map. used by e.g. per-player
2116# maps to change the path to ~playername/mappath
2053sub customise_for { 2117sub customise_for {
2054 my ($self, $ob) = @_; 2118 my ($self, $ob) = @_;
2055 2119
2056 return find "~" . $ob->name . "/" . $self->{path} 2120 return find "~" . $ob->name . "/" . $self->{path}
2057 if $self->per_player; 2121 if $self->per_player;
2211 2275
2212 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2213 2277
2214 return if $self->players; 2278 return if $self->players;
2215 2279
2216 warn "resetting map ", $self->path; 2280 warn "resetting map ", $self->path, "\n";
2217 2281
2218 $self->in_memory (cf::MAP_SWAPPED); 2282 $self->in_memory (cf::MAP_SWAPPED);
2219 2283
2220 # need to save uniques path 2284 # need to save uniques path
2221 unless ($self->{deny_save}) { 2285 unless ($self->{deny_save}) {
2312 : normalise $_ 2376 : normalise $_
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2377 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2378 ]
2315} 2379}
2316 2380
2381=item cf::map::static_maps
2382
2383Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2384file in the shared directory excluding F</styles> and F</editor>). May
2385block.
2386
2387=cut
2388
2389sub static_maps() {
2390 my @dirs = "";
2391 my @maps;
2392
2393 while (@dirs) {
2394 my $dir = shift @dirs;
2395
2396 next if $dir eq "/styles" || $dir eq "/editor";
2397
2398 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2399 or return;
2400
2401 for (@$files) {
2402 s/\.map$// or next;
2403 utf8::decode $_;
2404 push @maps, "$dir/$_";
2405 }
2406
2407 push @dirs, map "$dir/$_", @$dirs;
2408 }
2409
2410 \@maps
2411}
2412
2317=back 2413=back
2318 2414
2319=head3 cf::object 2415=head3 cf::object
2320 2416
2321=cut 2417=cut
2386 2482
2387our $SAY_CHANNEL = { 2483our $SAY_CHANNEL = {
2388 id => "say", 2484 id => "say",
2389 title => "Map", 2485 title => "Map",
2390 reply => "say ", 2486 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2487 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2392}; 2488};
2393 2489
2394our $CHAT_CHANNEL = { 2490our $CHAT_CHANNEL = {
2395 id => "chat", 2491 id => "chat",
2396 title => "Chat", 2492 title => "Chat",
2516 ($x, $y) = (-1, -1) 2612 ($x, $y) = (-1, -1)
2517 unless (defined $x) && (defined $y); 2613 unless (defined $x) && (defined $y);
2518 2614
2519 # use -1 or undef as default coordinates, not 0, 0 2615 # use -1 or undef as default coordinates, not 0, 0
2520 ($x, $y) = ($map->enter_x, $map->enter_y) 2616 ($x, $y) = ($map->enter_x, $map->enter_y)
2521 if $x <=0 && $y <= 0; 2617 if $x <= 0 && $y <= 0;
2522 2618
2523 $map->load; 2619 $map->load;
2524 $map->load_neighbours; 2620 $map->load_neighbours;
2525 2621
2526 return unless $self->contr->active; 2622 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2528 $self->activate_recursive;
2529 2623
2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2531 $self->enter_map ($map, $x, $y); 2625 $self->enter_map ($map, $x, $y);
2626
2627 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive;
2532} 2629}
2533 2630
2534=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2535 2632
2536Moves the player to the given map-path and coordinates by first freezing 2633Moves the player to the given map-path and coordinates by first freezing
2724 2821
2725 utf8::encode $text; 2822 utf8::encode $text;
2726 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2823 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2727} 2824}
2728 2825
2826=item $client->send_big_packet ($pkt)
2827
2828Like C<send_packet>, but tries to compress large packets, and fragments
2829them as required.
2830
2831=cut
2832
2833our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2834
2835sub cf::client::send_big_packet {
2836 my ($self, $pkt) = @_;
2837
2838 # try lzf for large packets
2839 $pkt = "lzf " . Compress::LZF::compress $pkt
2840 if 1024 <= length $pkt and $self->{can_lzf};
2841
2842 # split very large packets
2843 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2844 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2845 $pkt = "frag";
2846 }
2847
2848 $self->send_packet ($pkt);
2849}
2850
2729=item $client->send_msg ($channel, $msg, $color, [extra...]) 2851=item $client->send_msg ($channel, $msg, $color, [extra...])
2730 2852
2731Send a drawinfo or msg packet to the client, formatting the msg for the 2853Send a drawinfo or msg packet to the client, formatting the msg for the
2732client if neccessary. C<$type> should be a string identifying the type of 2854client if neccessary. C<$type> should be a string identifying the type of
2733the message, with C<log> being the default. If C<$color> is negative, suppress 2855the message, with C<log> being the default. If C<$color> is negative, suppress
2735 2857
2736=cut 2858=cut
2737 2859
2738# non-persistent channels (usually the info channel) 2860# non-persistent channels (usually the info channel)
2739our %CHANNEL = ( 2861our %CHANNEL = (
2862 "c/motd" => {
2863 id => "infobox",
2864 title => "MOTD",
2865 reply => undef,
2866 tooltip => "The message of the day",
2867 },
2740 "c/identify" => { 2868 "c/identify" => {
2741 id => "infobox", 2869 id => "infobox",
2742 title => "Identify", 2870 title => "Identify",
2743 reply => undef, 2871 reply => undef,
2744 tooltip => "Items recently identified", 2872 tooltip => "Items recently identified",
2746 "c/examine" => { 2874 "c/examine" => {
2747 id => "infobox", 2875 id => "infobox",
2748 title => "Examine", 2876 title => "Examine",
2749 reply => undef, 2877 reply => undef,
2750 tooltip => "Signs and other items you examined", 2878 tooltip => "Signs and other items you examined",
2879 },
2880 "c/shopinfo" => {
2881 id => "infobox",
2882 title => "Shop Info",
2883 reply => undef,
2884 tooltip => "What your bargaining skill tells you about the shop",
2751 }, 2885 },
2752 "c/book" => { 2886 "c/book" => {
2753 id => "infobox", 2887 id => "infobox",
2754 title => "Book", 2888 title => "Book",
2755 reply => undef, 2889 reply => undef,
2771 id => "infobox", 2905 id => "infobox",
2772 title => "Body Parts", 2906 title => "Body Parts",
2773 reply => undef, 2907 reply => undef,
2774 tooltip => "Shows which body parts you posess and are available", 2908 tooltip => "Shows which body parts you posess and are available",
2775 }, 2909 },
2910 "c/statistics" => {
2911 id => "infobox",
2912 title => "Statistics",
2913 reply => undef,
2914 tooltip => "Shows your primary statistics",
2915 },
2776 "c/skills" => { 2916 "c/skills" => {
2777 id => "infobox", 2917 id => "infobox",
2778 title => "Skills", 2918 title => "Skills",
2779 reply => undef, 2919 reply => undef,
2780 tooltip => "Shows your experience per skill and item power", 2920 tooltip => "Shows your experience per skill and item power",
2921 },
2922 "c/shopitems" => {
2923 id => "infobox",
2924 title => "Shop Items",
2925 reply => undef,
2926 tooltip => "Shows the items currently for sale in this shop",
2927 },
2928 "c/resistances" => {
2929 id => "infobox",
2930 title => "Resistances",
2931 reply => undef,
2932 tooltip => "Shows your resistances",
2933 },
2934 "c/pets" => {
2935 id => "infobox",
2936 title => "Pets",
2937 reply => undef,
2938 tooltip => "Shows information abotu your pets/a specific pet",
2939 },
2940 "c/perceiveself" => {
2941 id => "infobox",
2942 title => "Perceive Self",
2943 reply => undef,
2944 tooltip => "You gained detailed knowledge about yourself",
2781 }, 2945 },
2782 "c/uptime" => { 2946 "c/uptime" => {
2783 id => "infobox", 2947 id => "infobox",
2784 title => "Uptime", 2948 title => "Uptime",
2785 reply => undef, 2949 reply => undef,
2795 id => "party", 2959 id => "party",
2796 title => "Party", 2960 title => "Party",
2797 reply => "gsay ", 2961 reply => "gsay ",
2798 tooltip => "Messages and chat related to your party", 2962 tooltip => "Messages and chat related to your party",
2799 }, 2963 },
2964 "c/death" => {
2965 id => "death",
2966 title => "Death",
2967 reply => undef,
2968 tooltip => "Reason for and more info about your most recent death",
2969 },
2970 "c/say" => $SAY_CHANNEL,
2971 "c/chat" => $CHAT_CHANNEL,
2800); 2972);
2801 2973
2802sub cf::client::send_msg { 2974sub cf::client::send_msg {
2803 my ($self, $channel, $msg, $color, @extra) = @_; 2975 my ($self, $channel, $msg, $color, @extra) = @_;
2804 2976
2809 2981
2810 # check predefined channels, for the benefit of C 2982 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 2983 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 2984 $channel = $CHANNEL{$channel};
2813 2985
2814 $self->ext_msg (channel_info => $channel) 2986 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 2987 $channel = $channel->{id};
2818 2988
2819 } elsif (ref $channel) { 2989 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 2990 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 2991 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 2992 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 2993 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 2994 }
2826 2995
2827 $channel = $channel->{id}; 2996 $channel = $channel->{id};
2828 } 2997 }
2829 2998
2830 return unless @extra || length $msg; 2999 return unless @extra || length $msg;
2831 3000
2832 if ($self->can_msg) {
2833 # default colour, mask it out 3001 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3002 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 3003 if $color & cf::NDI_DEF;
2836 3004
2837 my $pkt = "msg " 3005 my $pkt = "msg "
2838 . $self->{json_coder}->encode ( 3006 . $self->{json_coder}->encode (
2839 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3007 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2840 ); 3008 );
2841 3009
2842 # try lzf for large packets
2843 $pkt = "lzf " . Compress::LZF::compress $pkt
2844 if 1024 <= length $pkt and $self->{can_lzf};
2845
2846 # split very large packets
2847 if (8192 < length $pkt and $self->{can_lzf}) {
2848 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2849 $pkt = "frag";
2850 }
2851
2852 $self->send_packet ($pkt); 3010 $self->send_big_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} 3011}
2879 3012
2880=item $client->ext_msg ($type, @msg) 3013=item $client->ext_msg ($type, @msg)
2881 3014
2882Sends an ext event to the client. 3015Sends an ext event to the client.
2885 3018
2886sub cf::client::ext_msg($$@) { 3019sub cf::client::ext_msg($$@) {
2887 my ($self, $type, @msg) = @_; 3020 my ($self, $type, @msg) = @_;
2888 3021
2889 if ($self->extcmd == 2) { 3022 if ($self->extcmd == 2) {
2890 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3023 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2891 } elsif ($self->extcmd == 1) { # TODO: remove 3024 } elsif ($self->extcmd == 1) { # TODO: remove
2892 push @msg, msgtype => "event_$type"; 3025 push @msg, msgtype => "event_$type";
2893 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2894 } 3027 }
2895} 3028}
2896 3029
2897=item $client->ext_reply ($msgid, @msg) 3030=item $client->ext_reply ($msgid, @msg)
2898 3031
2902 3035
2903sub cf::client::ext_reply($$@) { 3036sub cf::client::ext_reply($$@) {
2904 my ($self, $id, @msg) = @_; 3037 my ($self, $id, @msg) = @_;
2905 3038
2906 if ($self->extcmd == 2) { 3039 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2908 } elsif ($self->extcmd == 1) { 3041 } elsif ($self->extcmd == 1) {
2909 #TODO: version 1, remove 3042 #TODO: version 1, remove
2910 unshift @msg, msgtype => "reply", msgid => $id; 3043 unshift @msg, msgtype => "reply", msgid => $id;
2911 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3044 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2912 } 3045 }
2913} 3046}
2914 3047
2915=item $success = $client->query ($flags, "text", \&cb) 3048=item $success = $client->query ($flags, "text", \&cb)
2916 3049
3017 3150
3018 $coro 3151 $coro
3019} 3152}
3020 3153
3021cf::client->attach ( 3154cf::client->attach (
3022 on_destroy => sub { 3155 on_client_destroy => sub {
3023 my ($ns) = @_; 3156 my ($ns) = @_;
3024 3157
3025 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3158 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3026 }, 3159 },
3027); 3160);
3043our $safe_hole = new Safe::Hole; 3176our $safe_hole = new Safe::Hole;
3044 3177
3045$SIG{FPE} = 'IGNORE'; 3178$SIG{FPE} = 'IGNORE';
3046 3179
3047$safe->permit_only (Opcode::opset qw( 3180$safe->permit_only (Opcode::opset qw(
3048 :base_core :base_mem :base_orig :base_math 3181 :base_core :base_mem :base_orig :base_math :base_loop
3049 grepstart grepwhile mapstart mapwhile 3182 grepstart grepwhile mapstart mapwhile
3050 sort time 3183 sort time
3051)); 3184));
3052 3185
3053# here we export the classes and methods available to script code 3186# here we export the classes and methods available to script code
3057The following functions and methods are available within a safe environment: 3190The following functions and methods are available within a safe environment:
3058 3191
3059 cf::object 3192 cf::object
3060 contr pay_amount pay_player map x y force_find force_add destroy 3193 contr pay_amount pay_player map x y force_find force_add destroy
3061 insert remove name archname title slaying race decrease split 3194 insert remove name archname title slaying race decrease split
3195 value
3062 3196
3063 cf::object::player 3197 cf::object::player
3064 player 3198 player
3065 3199
3066 cf::player 3200 cf::player
3072=cut 3206=cut
3073 3207
3074for ( 3208for (
3075 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3209 ["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 3210 insert remove inv nrof name archname title slaying race
3077 decrease split destroy change_exp)], 3211 decrease split destroy change_exp value msg lore send_msg)],
3078 ["cf::object::player" => qw(player)], 3212 ["cf::object::player" => qw(player)],
3079 ["cf::player" => qw(peaceful)], 3213 ["cf::player" => qw(peaceful send_msg)],
3080 ["cf::map" => qw(trigger)], 3214 ["cf::map" => qw(trigger)],
3081) { 3215) {
3082 no strict 'refs'; 3216 no strict 'refs';
3083 my ($pkg, @funs) = @$_; 3217 my ($pkg, @funs) = @$_;
3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3102 3236
3103 my $qcode = $code; 3237 my $qcode = $code;
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3238 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3239 $qcode =~ s/\n/\\n/g;
3106 3240
3241 %vars = (_dummy => 0) unless %vars;
3242
3243 my @res;
3107 local $_; 3244 local $_;
3108 local @safe::cf::_safe_eval_args = values %vars;
3109 3245
3110 my $eval = 3246 my $eval =
3111 "do {\n" 3247 "do {\n"
3112 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3248 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3113 . "#line 0 \"{$qcode}\"\n" 3249 . "#line 0 \"{$qcode}\"\n"
3114 . $code 3250 . $code
3115 . "\n}" 3251 . "\n}"
3116 ; 3252 ;
3117 3253
3254 if ($CFG{safe_eval}) {
3118 sub_generation_inc; 3255 sub_generation_inc;
3256 local @safe::cf::_safe_eval_args = values %vars;
3119 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3257 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3120 sub_generation_inc; 3258 sub_generation_inc;
3259 } else {
3260 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval;
3262 }
3121 3263
3122 if ($@) { 3264 if ($@) {
3123 warn "$@"; 3265 warn "$@";
3124 warn "while executing safe code '$code'\n"; 3266 warn "while executing safe code '$code'\n";
3125 warn "with arguments " . (join " ", %vars) . "\n"; 3267 warn "with arguments " . (join " ", %vars) . "\n";
3144=cut 3286=cut
3145 3287
3146sub register_script_function { 3288sub register_script_function {
3147 my ($fun, $cb) = @_; 3289 my ($fun, $cb) = @_;
3148 3290
3149 no strict 'refs'; 3291 $fun = "safe::$fun" if $CFG{safe_eval};
3150 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3292 *$fun = $safe_hole->wrap ($cb);
3151} 3293}
3152 3294
3153=back 3295=back
3154 3296
3155=cut 3297=cut
3176 3318
3177 $facedata->{version} == 2 3319 $facedata->{version} == 2
3178 or cf::cleanup "$path: version mismatch, cannot proceed."; 3320 or cf::cleanup "$path: version mismatch, cannot proceed.";
3179 3321
3180 # patch in the exptable 3322 # patch in the exptable
3323 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3181 $facedata->{resource}{"res/exp_table"} = { 3324 $facedata->{resource}{"res/exp_table"} = {
3182 type => FT_RSRC, 3325 type => FT_RSRC,
3183 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3326 data => $exp_table,
3327 hash => (Digest::MD5::md5 $exp_table),
3184 }; 3328 };
3185 cf::cede_to_tick; 3329 cf::cede_to_tick;
3186 3330
3187 { 3331 {
3188 my $faces = $facedata->{faceinfo}; 3332 my $faces = $facedata->{faceinfo};
3190 while (my ($face, $info) = each %$faces) { 3334 while (my ($face, $info) = each %$faces) {
3191 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3335 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192 3336
3193 cf::face::set_visibility $idx, $info->{visibility}; 3337 cf::face::set_visibility $idx, $info->{visibility};
3194 cf::face::set_magicmap $idx, $info->{magicmap}; 3338 cf::face::set_magicmap $idx, $info->{magicmap};
3195 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3339 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3196 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3340 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3197 3341
3198 cf::cede_to_tick; 3342 cf::cede_to_tick;
3199 } 3343 }
3200 3344
3201 while (my ($face, $info) = each %$faces) { 3345 while (my ($face, $info) = each %$faces) {
3225 3369
3226 cf::anim::invalidate_all; # d'oh 3370 cf::anim::invalidate_all; # d'oh
3227 } 3371 }
3228 3372
3229 { 3373 {
3230 # TODO: for gcfclient pleasure, we should give resources
3231 # that gcfclient doesn't grok a >10000 face index.
3232 my $res = $facedata->{resource}; 3374 my $res = $facedata->{resource};
3233 3375
3234 while (my ($name, $info) = each %$res) { 3376 while (my ($name, $info) = each %$res) {
3235 if (defined $info->{type}) { 3377 if (defined $info->{type}) {
3236 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3378 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3237 my $data;
3238 3379
3239 if ($info->{type} & 1) { 3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3240 # prepend meta info
3241
3242 my $meta = $enc->encode ({
3243 name => $name,
3244 %{ $info->{meta} || {} },
3245 });
3246
3247 $data = pack "(w/a*)*", $meta, $info->{data};
3248 } else {
3249 $data = $info->{data};
3250 }
3251
3252 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3253 cf::face::set_type $idx, $info->{type}; 3381 cf::face::set_type $idx, $info->{type};
3254 } else { 3382 } else {
3255 $RESOURCE{$name} = $info; 3383 $RESOURCE{$name} = $info;
3256 } 3384 }
3257 3385
3340 reload_treasures; 3468 reload_treasures;
3341 3469
3342 warn "finished reloading resource files\n"; 3470 warn "finished reloading resource files\n";
3343} 3471}
3344 3472
3345sub init {
3346 my $guard = freeze_mainloop;
3347
3348 evthread_start IO::AIO::poll_fileno;
3349
3350 reload_resources;
3351}
3352
3353sub reload_config { 3473sub reload_config {
3474 warn "reloading config file...\n";
3475
3354 open my $fh, "<:utf8", "$CONFDIR/config" 3476 open my $fh, "<:utf8", "$CONFDIR/config"
3355 or return; 3477 or return;
3356 3478
3357 local $/; 3479 local $/;
3358 *CFG = YAML::Load <$fh>; 3480 *CFG = YAML::XS::Load scalar <$fh>;
3359 3481
3360 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3361 3483
3362 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3484 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3363 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3485 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3367 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3368 and die "WARNING: m(un)lockall failed: $!\n"; 3490 and die "WARNING: m(un)lockall failed: $!\n";
3369 }; 3491 };
3370 warn $@ if $@; 3492 warn $@ if $@;
3371 } 3493 }
3494
3495 warn "finished reloading resource files\n";
3372} 3496}
3373 3497
3374sub pidfile() { 3498sub pidfile() {
3375 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3376 or die "$PIDFILE: $!"; 3500 or die "$PIDFILE: $!";
3388 3512
3389 seek $fh, 0, 0; 3513 seek $fh, 0, 0;
3390 print $fh $$; 3514 print $fh $$;
3391} 3515}
3392 3516
3517sub main_loop {
3518 warn "EV::loop starting\n";
3519 if (1) {
3520 EV::loop;
3521 }
3522 warn "EV::loop returned\n";
3523 goto &main_loop unless $REALLY_UNLOOP;
3524}
3525
3393sub main { 3526sub main {
3394 atomic; 3527 cf::init_globals; # initialise logging
3528
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3533
3534 cf::init_experience;
3535 cf::init_anim;
3536 cf::init_attackmess;
3537 cf::init_dynamic;
3538
3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3395 3540
3396 # we must not ever block the main coroutine 3541 # we must not ever block the main coroutine
3397 local $Coro::idle = sub { 3542 local $Coro::idle = sub {
3398 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3543 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3399 (async { 3544 (async {
3400 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3545 $Coro::current->{desc} = "IDLE BUG HANDLER";
3401 EV::loop EV::LOOP_ONESHOT; 3546 EV::loop EV::LOOP_ONESHOT;
3402 })->prio (Coro::PRIO_MAX); 3547 })->prio (Coro::PRIO_MAX);
3403 }; 3548 };
3404 3549
3405 { 3550 evthread_start IO::AIO::poll_fileno;
3406 my $guard = freeze_mainloop; 3551
3552 cf::sync_job {
3553 cf::load_settings;
3554 cf::load_materials;
3555
3556 reload_resources;
3407 reload_config; 3557 reload_config;
3408 db_init; 3558 db_init;
3559
3560 cf::init_uuid;
3561 cf::init_signals;
3562 cf::init_skills;
3563
3564 cf::init_beforeplay;
3565
3566 atomic;
3567
3409 load_extensions; 3568 load_extensions;
3410 3569
3411 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3412 }
3413
3414 utime time, time, $RUNTIMEFILE; 3570 utime time, time, $RUNTIMEFILE;
3415 3571
3416 # no (long-running) fork's whatsoever before this point(!) 3572 # no (long-running) fork's whatsoever before this point(!)
3573 use POSIX ();
3417 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3418 3575
3419 EV::loop; 3576 (pop @POST_INIT)->(0) while @POST_INIT;
3577 };
3578
3579 main_loop;
3420} 3580}
3421 3581
3422############################################################################# 3582#############################################################################
3423# initialisation and cleanup 3583# initialisation and cleanup
3424 3584
3431 }; 3591 };
3432 } 3592 }
3433} 3593}
3434 3594
3435sub write_runtime_sync { 3595sub write_runtime_sync {
3596 my $t0 = EV::time;
3597
3436 # first touch the runtime file to show we are still running: 3598 # first touch the runtime file to show we are still running:
3437 # the fsync below can take a very very long time. 3599 # the fsync below can take a very very long time.
3438 3600
3439 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3601 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3440 3602
3441 my $guard = cf::lock_acquire "write_runtime"; 3603 my $guard = cf::lock_acquire "write_runtime";
3442 3604
3443 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3605 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3444 or return; 3606 or return;
3445 3607
3446 my $value = $cf::RUNTIME + 90 + 10; 3608 my $value = $cf::RUNTIME + 90 + 10;
3447 # 10 is the runtime save interval, for a monotonic clock 3609 # 10 is the runtime save interval, for a monotonic clock
3448 # 60 allows for the watchdog to kill the server. 3610 # 60 allows for the watchdog to kill the server.
3461 or return; 3623 or return;
3462 3624
3463 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3464 and return; 3626 and return;
3465 3627
3466 warn "runtime file written.\n"; 3628 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3467 3629
3468 1 3630 1
3469} 3631}
3470 3632
3471our $uuid_lock; 3633our $uuid_lock;
3480 my $uuid = "$LOCALDIR/uuid"; 3642 my $uuid = "$LOCALDIR/uuid";
3481 3643
3482 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3644 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3483 or return; 3645 or return;
3484 3646
3485 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3647 my $value = uuid_seq uuid_cur;
3648
3649 unless ($value) {
3650 warn "cowardly refusing to write zero uuid value!\n";
3651 return;
3652 }
3653
3654 my $value = uuid_str $value + $uuid_skip;
3486 $uuid_skip = 0; 3655 $uuid_skip = 0;
3487 3656
3488 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3657 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3489 and return; 3658 and return;
3490 3659
3512} 3681}
3513 3682
3514sub emergency_save() { 3683sub emergency_save() {
3515 my $freeze_guard = cf::freeze_mainloop; 3684 my $freeze_guard = cf::freeze_mainloop;
3516 3685
3517 warn "enter emergency perl save\n"; 3686 warn "emergency_perl_save: enter\n";
3518 3687
3519 cf::sync_job { 3688 cf::sync_job {
3689 # this is a trade-off: we want to be very quick here, so
3690 # save all maps without fsync, and later call a global sync
3691 # (which in turn might be very very slow)
3692 local $USE_FSYNC = 0;
3693
3520 # use a peculiar iteration method to avoid tripping on perl 3694 # use a peculiar iteration method to avoid tripping on perl
3521 # refcount bugs in for. also avoids problems with players 3695 # refcount bugs in for. also avoids problems with players
3522 # and maps saved/destroyed asynchronously. 3696 # and maps saved/destroyed asynchronously.
3523 warn "begin emergency player save\n"; 3697 warn "emergency_perl_save: begin player save\n";
3524 for my $login (keys %cf::PLAYER) { 3698 for my $login (keys %cf::PLAYER) {
3525 my $pl = $cf::PLAYER{$login} or next; 3699 my $pl = $cf::PLAYER{$login} or next;
3526 $pl->valid or next; 3700 $pl->valid or next;
3527 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3528 $pl->save; 3702 $pl->save;
3529 } 3703 }
3530 warn "end emergency player save\n"; 3704 warn "emergency_perl_save: end player save\n";
3531 3705
3532 warn "begin emergency map save\n"; 3706 warn "emergency_perl_save: begin map save\n";
3533 for my $path (keys %cf::MAP) { 3707 for my $path (keys %cf::MAP) {
3534 my $map = $cf::MAP{$path} or next; 3708 my $map = $cf::MAP{$path} or next;
3535 $map->valid or next; 3709 $map->valid or next;
3536 $map->save; 3710 $map->save;
3537 } 3711 }
3538 warn "end emergency map save\n"; 3712 warn "emergency_perl_save: end map save\n";
3539 3713
3540 warn "begin emergency database checkpoint\n"; 3714 warn "emergency_perl_save: begin database checkpoint\n";
3541 BDB::db_env_txn_checkpoint $DB_ENV; 3715 BDB::db_env_txn_checkpoint $DB_ENV;
3542 warn "end emergency database checkpoint\n"; 3716 warn "emergency_perl_save: end database checkpoint\n";
3543 3717
3544 warn "begin write uuid\n"; 3718 warn "emergency_perl_save: begin write uuid\n";
3545 write_uuid_sync 1; 3719 write_uuid_sync 1;
3546 warn "end write uuid\n"; 3720 warn "emergency_perl_save: end write uuid\n";
3547 }; 3721 };
3548 3722
3723 warn "emergency_perl_save: starting sync()\n";
3724 IO::AIO::aio_sync sub {
3725 warn "emergency_perl_save: finished sync()\n";
3726 };
3727
3549 warn "leave emergency perl save\n"; 3728 warn "emergency_perl_save: leave\n";
3550} 3729}
3551 3730
3552sub post_cleanup { 3731sub post_cleanup {
3553 my ($make_core) = @_; 3732 my ($make_core) = @_;
3554 3733
3580 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3759 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3581 for my $name (keys %$leaf_symtab) { 3760 for my $name (keys %$leaf_symtab) {
3582 _gv_clear *{"$pkg$name"}; 3761 _gv_clear *{"$pkg$name"};
3583# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3762# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3584 } 3763 }
3585 warn "cleared package #$pkg\n";#d# 3764 warn "cleared package $pkg\n";#d#
3586} 3765}
3587
3588our $RELOAD; # how many times to reload
3589 3766
3590sub do_reload_perl() { 3767sub do_reload_perl() {
3591 # can/must only be called in main 3768 # can/must only be called in main
3592 if ($Coro::current != $Coro::main) { 3769 if ($Coro::current != $Coro::main) {
3593 warn "can only reload from main coroutine"; 3770 warn "can only reload from main coroutine";
3594 return; 3771 return;
3595 } 3772 }
3596 3773
3597 return if $RELOAD++; 3774 return if $RELOAD++;
3775
3776 my $t1 = EV::time;
3598 3777
3599 while ($RELOAD) { 3778 while ($RELOAD) {
3600 warn "reloading..."; 3779 warn "reloading...";
3601 3780
3602 warn "entering sync_job"; 3781 warn "entering sync_job";
3663 clear_package "safe::$_" 3842 clear_package "safe::$_"
3664 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3843 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3665 3844
3666 warn "unloading cf.pm \"a bit\""; 3845 warn "unloading cf.pm \"a bit\"";
3667 delete $INC{"cf.pm"}; 3846 delete $INC{"cf.pm"};
3668 delete $INC{"cf/pod.pm"}; 3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3669 3848
3670 # don't, removes xs symbols, too, 3849 # don't, removes xs symbols, too,
3671 # and global variables created in xs 3850 # and global variables created in xs
3672 #clear_package __PACKAGE__; 3851 #clear_package __PACKAGE__;
3673 3852
3674 warn "unload completed, starting to reload now"; 3853 warn "unload completed, starting to reload now";
3675 3854
3676 warn "reloading cf.pm"; 3855 warn "reloading cf.pm";
3677 require cf; 3856 require cf;
3678 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3857 cf::_connect_to_perl_1;
3679 3858
3680 warn "loading config and database again"; 3859 warn "loading config and database again";
3681 cf::reload_config; 3860 cf::reload_config;
3682 3861
3683 warn "loading extensions"; 3862 warn "loading extensions";
3684 cf::load_extensions; 3863 cf::load_extensions;
3685 3864
3865 if ($REATTACH_ON_RELOAD) {
3686 warn "reattaching attachments to objects/players"; 3866 warn "reattaching attachments to objects/players";
3687 _global_reattach; # objects, sockets 3867 _global_reattach; # objects, sockets
3688 warn "reattaching attachments to maps"; 3868 warn "reattaching attachments to maps";
3689 reattach $_ for values %MAP; 3869 reattach $_ for values %MAP;
3690 warn "reattaching attachments to players"; 3870 warn "reattaching attachments to players";
3691 reattach $_ for values %PLAYER; 3871 reattach $_ for values %PLAYER;
3872 }
3873
3874 warn "running post_init jobs";
3875 (pop @POST_INIT)->(1) while @POST_INIT;
3692 3876
3693 warn "leaving sync_job"; 3877 warn "leaving sync_job";
3694 3878
3695 1 3879 1
3696 } or do { 3880 } or do {
3699 }; 3883 };
3700 3884
3701 warn "reloaded"; 3885 warn "reloaded";
3702 --$RELOAD; 3886 --$RELOAD;
3703 } 3887 }
3888
3889 $t1 = EV::time - $t1;
3890 warn "reload completed in ${t1}s\n";
3704}; 3891};
3705 3892
3706our $RELOAD_WATCHER; # used only during reload 3893our $RELOAD_WATCHER; # used only during reload
3707 3894
3708sub reload_perl() { 3895sub reload_perl() {
3709 # doing reload synchronously and two reloads happen back-to-back, 3896 # doing reload synchronously and two reloads happen back-to-back,
3710 # coro crashes during coro_state_free->destroy here. 3897 # coro crashes during coro_state_free->destroy here.
3711 3898
3899 $RELOAD_WATCHER ||= cf::async {
3900 Coro::AIO::aio_wait cache_extensions;
3901
3712 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3902 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3713 do_reload_perl; 3903 do_reload_perl;
3714 undef $RELOAD_WATCHER; 3904 undef $RELOAD_WATCHER;
3905 };
3715 }; 3906 };
3716} 3907}
3717 3908
3718register_command "reload" => sub { 3909register_command "reload" => sub {
3719 my ($who, $arg) = @_; 3910 my ($who, $arg) = @_;
3733 3924
3734our @WAIT_FOR_TICK; 3925our @WAIT_FOR_TICK;
3735our @WAIT_FOR_TICK_BEGIN; 3926our @WAIT_FOR_TICK_BEGIN;
3736 3927
3737sub wait_for_tick { 3928sub wait_for_tick {
3738 return if tick_inhibit || $Coro::current == $Coro::main; 3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3739 3930
3740 my $signal = new Coro::Signal; 3931 my $signal = new Coro::Signal;
3741 push @WAIT_FOR_TICK, $signal; 3932 push @WAIT_FOR_TICK, $signal;
3742 $signal->wait; 3933 $signal->wait;
3743} 3934}
3744 3935
3745sub wait_for_tick_begin { 3936sub wait_for_tick_begin {
3746 return if tick_inhibit || $Coro::current == $Coro::main; 3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3747 3938
3748 my $signal = new Coro::Signal; 3939 my $signal = new Coro::Signal;
3749 push @WAIT_FOR_TICK_BEGIN, $signal; 3940 push @WAIT_FOR_TICK_BEGIN, $signal;
3750 $signal->wait; 3941 $signal->wait;
3751} 3942}
3756 unless ++$bug_warning > 10; 3947 unless ++$bug_warning > 10;
3757 return; 3948 return;
3758 } 3949 }
3759 3950
3760 cf::server_tick; # one server iteration 3951 cf::server_tick; # one server iteration
3952
3953 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3761 3954
3762 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3955 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3763 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3764 Coro::async_pool { 3957 Coro::async_pool {
3765 $Coro::current->{desc} = "runtime saver"; 3958 $Coro::current->{desc} = "runtime saver";
3788} 3981}
3789 3982
3790{ 3983{
3791 # configure BDB 3984 # configure BDB
3792 3985
3793 BDB::min_parallel 8; 3986 BDB::min_parallel 16;
3794 BDB::max_poll_reqs $TICK * 0.1; 3987 BDB::max_poll_reqs $TICK * 0.1;
3795 $AnyEvent::BDB::WATCHER->priority (1); 3988 $AnyEvent::BDB::WATCHER->priority (1);
3796 3989
3797 unless ($DB_ENV) { 3990 unless ($DB_ENV) {
3798 $DB_ENV = BDB::db_env_create; 3991 $DB_ENV = BDB::db_env_create;
3878 LOG llevInfo, "[ABT] [suppressed]\n"; 4071 LOG llevInfo, "[ABT] [suppressed]\n";
3879 } 4072 }
3880} 4073}
3881 4074
3882# load additional modules 4075# load additional modules
3883use cf::pod; 4076require "cf/$_.pm" for @EXTRA_MODULES;
4077cf::_connect_to_perl_2;
3884 4078
3885END { cf::emergency_save } 4079END { cf::emergency_save }
3886 4080
38871 40811
3888 4082

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines