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.287 by root, Mon Jun 25 05:43:45 2007 UTC vs.
Revision 1.545 by root, Thu May 6 22:35:41 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.61 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
51use Coro::Util ();
24 52
53use JSON::XS 2.01 ();
25use BDB (); 54use BDB ();
26use Data::Dumper; 55use Data::Dumper;
27use Digest::MD5;
28use Fcntl; 56use Fcntl;
29use YAML::Syck (); 57use YAML::XS ();
30use IO::AIO 2.32 (); 58use IO::AIO ();
31use Time::HiRes; 59use Time::HiRes;
32use Compress::LZF; 60use Compress::LZF;
61use Digest::MD5 ();
62
63AnyEvent::detect;
33 64
34# configure various modules to our taste 65# configure various modules to our taste
35# 66#
36$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 75
40$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
41 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 78
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
48 82
49our %COMMAND = (); 83our %COMMAND = ();
50our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
51 85
52our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 87our %EXTCMD = ();
54our %EXTICMD = (); 88our %EXTICMD = ();
55our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
56our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
57 91
58our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
59our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
60 96
61our $CONFDIR = confdir; 97our $CONFDIR = confdir;
62our $DATADIR = datadir; 98our $DATADIR = datadir;
63our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
64our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
65our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
66our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
67our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
68our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
69our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
70our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
71our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
72 118
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 121our $NEXT_TICK;
78our $NOW;
79our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
80 123
124our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER;
81our $BDB_POLL_WATCHER; 126our $BDB_TRICKLE_WATCHER;
82our $DB_ENV; 127our $DB_ENV;
128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
83 130
84our %CFG; 131our %CFG;
85 132
86our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
87our $RUNTIME; 134our $RUNTIME;
135our $NOW;
88 136
89our %PLAYER; # all users 137our (%PLAYER, %PLAYER_LOADING); # all users
90our %MAP; # all maps 138our (%MAP, %MAP_LOADING ); # all maps
91our $LINK_MAP; # the special {link} map, which is always available 139our $LINK_MAP; # the special {link} map, which is always available
92 140
93# used to convert map paths into valid unix filenames by replacing / by ∕ 141# used to convert map paths into valid unix filenames by replacing / by ∕
94our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
95 143
96our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
97our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
98our $tick_start; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
99 153
100binmode STDOUT; 154binmode STDOUT;
101binmode STDERR; 155binmode STDERR;
102 156
103# read virtual server time, if available 157# read virtual server time, if available
104unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
105 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
106 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
107 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
108} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
109 165
110mkdir $_ 166mkdir $_
111 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
112 168
113our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
114 170
115sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
116 187
117############################################################################# 188#############################################################################
118 189
119=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
120 191
156 227
157The raw value load value from the last tick. 228The raw value load value from the last tick.
158 229
159=item %cf::CFG 230=item %cf::CFG
160 231
161Configuration for the server, loaded from C</etc/crossfire/config>, or 232Configuration for the server, loaded from C</etc/deliantra-server/config>, or
162from wherever your confdir points to. 233from wherever your confdir points to.
163 234
164=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
165 236
166These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
167returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one process
168per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
169 240
241=item @cf::INVOKE_RESULTS
242
243This array contains the results of the last C<invoke ()> call. When
244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
245that call.
246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
170=back 253=back
171 254
172=cut 255=cut
173 256
174BEGIN { 257sub error(@) { LOG llevError, join "", @_ }
175 *CORE::GLOBAL::warn = sub { 258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
263$Coro::State::WARNHOOK = sub {
176 my $msg = join "", @_; 264 my $msg = join "", @_;
177 265
178 $msg .= "\n" 266 $msg .= "\n"
179 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
180 268
181 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
182 270
183 utf8::encode $msg;
184 LOG llevError, $msg; 271 LOG llevWarn, $msg;
185 }; 272};
186} 273
274$Coro::State::DIEHOOK = sub {
275 return unless $^S eq 0; # "eq", not "=="
276
277 error Carp::longmess $_[0];
278
279 if (in_main) {#d#
280 error "DIEHOOK called in main context, Coro bug?\n";#d#
281 return;#d#
282 }#d#
283
284 # kill coroutine otherwise
285 Coro::terminate
286};
187 287
188@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 288@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
189@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 289@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
190@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 290@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
191@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 291@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
198for my $pkg (qw( 298for my $pkg (qw(
199 cf::global cf::attachable 299 cf::global cf::attachable
200 cf::object cf::object::player 300 cf::object cf::object::player
201 cf::client cf::player 301 cf::client cf::player
202 cf::arch cf::living 302 cf::arch cf::living
303 cf::map cf::mapspace
203 cf::map cf::party cf::region 304 cf::party cf::region
204)) { 305)) {
205 no strict 'refs';
206 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
207} 307}
208 308
209$Event::DIED = sub { 309$EV::DIED = sub {
210 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
211}; 311};
212 312
213############################################################################# 313#############################################################################
214 314
215=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
237 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 337 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
238 $d 338 $d
239 } || "[unable to dump $_[0]: '$@']"; 339 } || "[unable to dump $_[0]: '$@']";
240} 340}
241 341
242use JSON::XS ();
243
244=item $ref = cf::from_json $json 342=item $ref = cf::decode_json $json
245 343
246Converts a JSON string into the corresponding perl data structure. 344Converts a JSON string into the corresponding perl data structure.
247 345
248=item $json = cf::to_json $ref 346=item $json = cf::encode_json $ref
249 347
250Converts a perl data structure into its JSON representation. 348Converts a perl data structure into its JSON representation.
251 349
252=cut 350=cut
253 351
254our $json_coder = JSON::XS->new->convert_blessed->utf8; 352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 353
256sub to_json ($) { $json_coder->encode ($_[0]) } 354sub encode_json($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 355sub decode_json($) { $json_coder->decode ($_[0]) }
356
357=item cf::post_init { BLOCK }
358
359Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again.
361
362The cdoeblock will have a single boolean argument to indicate whether this
363is a reload or not.
364
365=cut
366
367sub post_init(&) {
368 push @POST_INIT, shift;
369}
258 370
259=item cf::lock_wait $string 371=item cf::lock_wait $string
260 372
261Wait until the given lock is available. See cf::lock_acquire. 373Wait until the given lock is available. See cf::lock_acquire.
262 374
263=item my $lock = cf::lock_acquire $string 375=item my $lock = cf::lock_acquire $string
264 376
265Wait until the given lock is available and then acquires it and returns 377Wait until the given lock is available and then acquires it and returns
266a Coro::guard object. If the guard object gets destroyed (goes out of scope, 378a L<Guard> object. If the guard object gets destroyed (goes out of scope,
267for example when the coroutine gets canceled), the lock is automatically 379for example when the coroutine gets canceled), the lock is automatically
268returned. 380returned.
269 381
382Locks are *not* recursive, locking from the same coro twice results in a
383deadlocked coro.
384
270Lock names should begin with a unique identifier (for example, cf::map::find 385Lock names should begin with a unique identifier (for example, cf::map::find
271uses map_find and cf::map::load uses map_load). 386uses map_find and cf::map::load uses map_load).
272 387
273=item $locked = cf::lock_active $string 388=item $locked = cf::lock_active $string
274 389
275Return true if the lock is currently active, i.e. somebody has locked it. 390Return true if the lock is currently active, i.e. somebody has locked it.
276 391
277=cut 392=cut
278 393
279our %LOCK; 394our $LOCKS = new Coro::SemaphoreSet;
280 395
281sub lock_wait($) { 396sub lock_wait($) {
282 my ($key) = @_; 397 $LOCKS->wait ($_[0]);
283
284 # wait for lock, if any
285 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule;
288 }
289} 398}
290 399
291sub lock_acquire($) { 400sub lock_acquire($) {
292 my ($key) = @_; 401 $LOCKS->guard ($_[0])
293
294 # wait, to be sure we are not locked
295 lock_wait $key;
296
297 $LOCK{$key} = [];
298
299 Coro::guard {
300 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} };
302 }
303} 402}
304 403
305sub lock_active($) { 404sub lock_active($) {
306 my ($key) = @_; 405 $LOCKS->count ($_[0]) < 1
307
308 ! ! $LOCK{$key}
309} 406}
310 407
311sub freeze_mainloop { 408sub freeze_mainloop {
312 return unless $TICK_WATCHER->is_active; 409 tick_inhibit_inc;
313 410
314 my $guard = Coro::guard { 411 &Guard::guard (\&tick_inhibit_dec);
315 $TICK_WATCHER->start; 412}
413
414=item cf::periodic $interval, $cb
415
416Like EV::periodic, but randomly selects a starting point so that the actions
417get spread over time.
418
419=cut
420
421sub periodic($$) {
422 my ($interval, $cb) = @_;
423
424 my $start = rand List::Util::min 180, $interval;
425
426 EV::periodic $start, $interval, 0, $cb
427}
428
429=item cf::get_slot $time[, $priority[, $name]]
430
431Allocate $time seconds of blocking CPU time at priority C<$priority>:
432This call blocks and returns only when you have at least C<$time> seconds
433of cpu time till the next tick. The slot is only valid till the next cede.
434
435The optional C<$name> can be used to identify the job to run. It might be
436used for statistical purposes and should identify the same time-class.
437
438Useful for short background jobs.
439
440=cut
441
442our @SLOT_QUEUE;
443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
445
446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
447$SLOT_QUEUE = Coro::async {
448 $Coro::current->desc ("timeslot manager");
449
450 my $signal = new Coro::Signal;
451 my $busy;
452
453 while () {
454 next_job:
455
456 my $avail = cf::till_tick;
457
458 for (0 .. $#SLOT_QUEUE) {
459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
461 my $job = splice @SLOT_QUEUE, $_, 1, ();
462 $job->[2]->send;
463 Coro::cede;
464 goto next_job;
465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
467 }
468 }
469
470 if (@SLOT_QUEUE) {
471 # we do not use wait_for_tick() as it returns immediately when tick is inactive
472 push @cf::WAIT_FOR_TICK, $signal;
473 $signal->wait;
474 } else {
475 $busy = 0;
476 Coro::schedule;
477 }
316 }; 478 }
317 $TICK_WATCHER->stop; 479};
318 $guard 480
481sub get_slot($;$$) {
482 return if tick_inhibit || $Coro::current == $Coro::main;
483
484 my ($time, $pri, $name) = @_;
485
486 $time = clamp $time, 0.01, $TICK * .6;
487
488 my $sig = new Coro::Signal;
489
490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
492 $SLOT_QUEUE->ready;
493 $sig->wait;
319} 494}
320 495
321=item cf::async { BLOCK } 496=item cf::async { BLOCK }
322 497
323Currently the same as Coro::async_pool, meaning you cannot use 498Currently the same as Coro::async_pool, meaning you cannot use
328 503
329BEGIN { *async = \&Coro::async_pool } 504BEGIN { *async = \&Coro::async_pool }
330 505
331=item cf::sync_job { BLOCK } 506=item cf::sync_job { BLOCK }
332 507
333The design of Crossfire TRT requires that the main coroutine ($Coro::main) 508The design of Deliantra requires that the main coroutine ($Coro::main)
334is always able to handle events or runnable, as Crossfire TRT is only 509is always able to handle events or runnable, as Deliantra is only
335partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 510partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
336acceptable. 511acceptable.
337 512
338If it must be done, put the blocking parts into C<sync_job>. This will run 513If it must be done, put the blocking parts into C<sync_job>. This will run
339the given BLOCK in another coroutine while waiting for the result. The 514the given BLOCK in another coroutine while waiting for the result. The
343=cut 518=cut
344 519
345sub sync_job(&) { 520sub sync_job(&) {
346 my ($job) = @_; 521 my ($job) = @_;
347 522
348 if ($Coro::current == $Coro::main) { 523 if (in_main) {
349 my $time = Event::time; 524 my $time = AE::time;
350 525
351 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
353 528
354 # TODO: use suspend/resume instead 529 #LOG llevError, Carp::longmess "sync job";#d#
355 # (but this is cancel-safe) 530
356 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
357 532
358 my $busy = 1; 533 my $busy = 1;
359 my @res; 534 my @res;
360 535
361 (async { 536 (async {
537 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 538 @res = eval { $job->() };
363 warn $@ if $@; 539 error $@ if $@;
364 undef $busy; 540 undef $busy;
365 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
366 542
367 while ($busy) { 543 while ($busy) {
368 Coro::cede or Event::one_event; 544 if (Coro::nready) {
545 Coro::cede_notself;
546 } else {
547 EV::loop EV::LOOP_ONESHOT;
369 } 548 }
549 }
370 550
371 $time = Event::time - $time; 551 my $time = AE::time - $time;
372 552
373 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375
376 $tick_start += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
377 554
378 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
379 } else { 556 } else {
380 # we are in another coroutine, how wonderful, everything just works 557 # we are in another coroutine, how wonderful, everything just works
381 558
406=item fork_call { }, $args 583=item fork_call { }, $args
407 584
408Executes the given code block with the given arguments in a seperate 585Executes the given code block with the given arguments in a seperate
409process, returning the results. Everything must be serialisable with 586process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may 587Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 588never block itself or use any form of event handling.
412 589
413=cut 590=cut
414 591
415sub fork_call(&@) { 592sub fork_call(&@) {
416 my ($cb, @args) = @_; 593 my ($cb, @args) = @_;
417 594
418# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 595 # we seemingly have to make a local copy of the whole thing,
419# or die "socketpair: $!"; 596 # otherwise perl prematurely frees the stuff :/
420 pipe my $fh1, my $fh2 597 # TODO: investigate and fix (likely this will be rather laborious)
421 or die "pipe: $!";
422 598
423 if (my $pid = fork) { 599 my @res = Coro::Util::fork_eval {
424 close $fh2;
425
426 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 die $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals; 600 reset_signals;
436 local $SIG{__WARN__}; 601 &$cb
437 local $SIG{__DIE__}; 602 }, @args;
438 eval {
439 close $fh1;
440 603
441 my @res = eval { $cb->(@args) }; 604 wantarray ? @res : $res[-1]
442 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 605}
443 };
444 606
445 warn $@ if $@; 607sub objinfo {
446 _exit 0;
447 } 608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
616}
617
618=item $coin = coin_from_name $name
619
620=cut
621
622our %coin_alias = (
623 "silver" => "silvercoin",
624 "silvercoin" => "silvercoin",
625 "silvercoins" => "silvercoin",
626 "gold" => "goldcoin",
627 "goldcoin" => "goldcoin",
628 "goldcoins" => "goldcoin",
629 "platinum" => "platinacoin",
630 "platinumcoin" => "platinacoin",
631 "platinumcoins" => "platinacoin",
632 "platina" => "platinacoin",
633 "platinacoin" => "platinacoin",
634 "platinacoins" => "platinacoin",
635 "royalty" => "royalty",
636 "royalties" => "royalty",
637);
638
639sub coin_from_name($) {
640 $coin_alias{$_[0]}
641 ? cf::arch::find $coin_alias{$_[0]}
642 : undef
448} 643}
449 644
450=item $value = cf::db_get $family => $key 645=item $value = cf::db_get $family => $key
451 646
452Returns a single value from the environment database. 647Returns a single value from the environment database.
454=item cf::db_put $family => $key => $value 649=item cf::db_put $family => $key => $value
455 650
456Stores the given C<$value> in the family. It can currently store binary 651Stores the given C<$value> in the family. It can currently store binary
457data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 652data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
458 653
654=item $db = cf::db_table "name"
655
656Create and/or open a new database table. The string must not be "db" and must be unique
657within each server.
658
459=cut 659=cut
660
661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
665 my ($name) = @_;
666 my $db = BDB::db_create $DB_ENV;
667
668 eval {
669 $db->set_flags (BDB::CHKSUM);
670
671 utf8::encode $name;
672 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
673 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
674 cf::cleanup "db_open(db): $!" if $!;
675 };
676 cf::cleanup "db_open(db): $@" if $@;
677
678 $db
679}
460 680
461our $DB; 681our $DB;
462 682
463sub db_init { 683sub db_init {
464 unless ($DB) { 684 $DB ||= db_table "db";
465 $DB = BDB::db_create $DB_ENV;
466
467 cf::sync_job {
468 eval {
469 $DB->set_flags (BDB::CHKSUM);
470
471 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
472 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
473 cf::cleanup "db_open(db): $!" if $!;
474 };
475 cf::cleanup "db_open(db): $@" if $@;
476 };
477 }
478} 685}
479 686
480sub db_get($$) { 687sub db_get($$) {
481 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
482 689
483 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
484 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
485 694
486 $! ? () 695 $! ? ()
487 : $data 696 : $data
488 }
489} 697}
490 698
491sub db_put($$$) { 699sub db_put($$$) {
492 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
493 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
532 if (1) { 740 if (1) {
533 $md5 = 741 $md5 =
534 join "\x00", 742 join "\x00",
535 $processversion, 743 $processversion,
536 map { 744 map {
537 Coro::cede; 745 cf::cede_to_tick;
538 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 746 ($src->[$_], Digest::MD5::md5_hex $data[$_])
539 } 0.. $#$src; 747 } 0.. $#$src;
540 748
541 749
542 my $dbmd5 = db_get cache => "$id/md5"; 750 my $dbmd5 = db_get cache => "$id/md5";
549 757
550 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
551 my $data = $process->(\@data); 759 my $data = $process->(\@data);
552 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
553 761
554 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
555 763
556 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
557 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
558 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
559 767
569 777
570=cut 778=cut
571 779
572sub datalog($@) { 780sub datalog($@) {
573 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
574 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
575} 783}
576 784
577=back 785=back
578 786
579=cut 787=cut
580 788
581############################################################################# 789#############################################################################
582 790
583=head2 ATTACHABLE OBJECTS 791=head2 ATTACHABLE OBJECTS
584 792
585Many objects in crossfire are so-called attachable objects. That means you can 793Many objects in deliantra are so-called attachable objects. That means you can
586attach callbacks/event handlers (a collection of which is called an "attachment") 794attach callbacks/event handlers (a collection of which is called an "attachment")
587to it. All such attachable objects support the following methods. 795to it. All such attachable objects support the following methods.
588 796
589In the following description, CLASS can be any of C<global>, C<object> 797In the following description, CLASS can be any of C<global>, C<object>
590C<player>, C<client> or C<map> (i.e. the attachable objects in 798C<player>, C<client> or C<map> (i.e. the attachable objects in
591Crossfire TRT). 799Deliantra).
592 800
593=over 4 801=over 4
594 802
595=item $attachable->attach ($attachment, key => $value...) 803=item $attachable->attach ($attachment, key => $value...)
596 804
640=item cf::CLASS::attachment $name, ... 848=item cf::CLASS::attachment $name, ...
641 849
642Register an attachment by C<$name> through which attachable objects of the 850Register an attachment by C<$name> through which attachable objects of the
643given CLASS can refer to this attachment. 851given CLASS can refer to this attachment.
644 852
645Some classes such as crossfire maps and objects can specify attachments 853Some classes such as deliantra maps and objects can specify attachments
646that are attached at load/instantiate time, thus the need for a name. 854that are attached at load/instantiate time, thus the need for a name.
647 855
648These calls expect any number of the following handler/hook descriptions: 856These calls expect any number of the following handler/hook descriptions:
649 857
650=over 4 858=over 4
774 982
775 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
776 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
777 985
778 } elsif (ref $type) { 986 } elsif (ref $type) {
779 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
780 988
781 } else { 989 } else {
782 shift @arg; 990 shift @arg;
783 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
784 } 992 }
785 } 993 }
786} 994}
787 995
788sub _object_attach { 996sub _object_attach {
798 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
799 } 1007 }
800 1008
801 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
802 } else { 1010 } else {
803 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
804 } 1012 }
805 1013
806 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
807} 1015}
808 1016
848 "; 1056 ";
849 die if $@; 1057 die if $@;
850} 1058}
851 1059
852our $override; 1060our $override;
853our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1061our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
854 1062
855sub override { 1063sub override {
856 $override = 1; 1064 $override = 1;
857 @invoke_results = (); 1065 @INVOKE_RESULTS = (@_);
858} 1066}
859 1067
860sub do_invoke { 1068sub do_invoke {
861 my $event = shift; 1069 my $event = shift;
862 my $callbacks = shift; 1070 my $callbacks = shift;
863 1071
864 @invoke_results = (); 1072 @INVOKE_RESULTS = ();
865 1073
866 local $override; 1074 local $override;
867 1075
868 for (@$callbacks) { 1076 for (@$callbacks) {
869 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
870 1078
871 if ($@) { 1079 if ($@) {
872 warn "$@";
873 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
874 override; 1081 override;
875 } 1082 }
876 1083
877 return 1 if $override; 1084 return 1 if $override;
878 } 1085 }
879 1086
880 0 1087 0
881} 1088}
882 1089
883=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1090=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
884 1091
885=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1092=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
886 1093
887Generate an object-specific event with the given arguments. 1094Generate an object-specific event with the given arguments.
888 1095
889This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1096This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
890removed in future versions), and there is no public API to access override 1097removed in future versions), and there is no public API to access override
891results (if you must, access C<@cf::invoke_results> directly). 1098results (if you must, access C<@cf::INVOKE_RESULTS> directly).
892 1099
893=back 1100=back
894 1101
895=cut 1102=cut
896 1103
897############################################################################# 1104#############################################################################
898# object support 1105# object support
1106
1107sub _object_equal($$);
1108sub _object_equal($$) {
1109 my ($a, $b) = @_;
1110
1111 return 0 unless (ref $a) eq (ref $b);
1112
1113 if ("HASH" eq ref $a) {
1114 my @ka = keys %$a;
1115 my @kb = keys %$b;
1116
1117 return 0 if @ka != @kb;
1118
1119 for (0 .. $#ka) {
1120 return 0 unless $ka[$_] eq $kb[$_];
1121 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1122 }
1123
1124 } elsif ("ARRAY" eq ref $a) {
1125
1126 return 0 if @$a != @$b;
1127
1128 for (0 .. $#$a) {
1129 return 0 unless _object_equal $a->[$_], $b->[$_];
1130 }
1131
1132 } elsif ($a ne $b) {
1133 return 0;
1134 }
1135
1136 1
1137}
1138
1139our $SLOW_MERGES;#d#
1140sub _can_merge {
1141 my ($ob1, $ob2) = @_;
1142
1143 ++$SLOW_MERGES;#d#
1144
1145 # we do the slow way here
1146 return _object_equal $ob1, $ob2
1147}
899 1148
900sub reattach { 1149sub reattach {
901 # basically do the same as instantiate, without calling instantiate 1150 # basically do the same as instantiate, without calling instantiate
902 my ($obj) = @_; 1151 my ($obj) = @_;
903 1152
1153 # no longer needed after getting rid of delete_package?
904 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1154 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
905 1155
906 my $registry = $obj->registry; 1156 my $registry = $obj->registry;
907 1157
908 @$registry = (); 1158 @$registry = ();
909 1159
914 for (@$attach) { 1164 for (@$attach) {
915 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
916 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
917 } 1167 }
918 } else { 1168 } else {
919 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
920 } 1170 }
921 } 1171 }
922} 1172}
923 1173
924cf::attachable->attach ( 1174cf::attachable->attach (
925 prio => -1000000, 1175 prio => -1000000,
926 on_instantiate => sub { 1176 on_instantiate => sub {
927 my ($obj, $data) = @_; 1177 my ($obj, $data) = @_;
928 1178
929 $data = from_json $data; 1179 $data = decode_json $data;
930 1180
931 for (@$data) { 1181 for (@$data) {
932 my ($name, $args) = @$_; 1182 my ($name, $args) = @$_;
933 1183
934 $obj->attach ($name, %{$args || {} }); 1184 $obj->attach ($name, %{$args || {} });
950sub object_freezer_save { 1200sub object_freezer_save {
951 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
952 1202
953 sync_job { 1203 sync_job {
954 if (length $$rdata) { 1204 if (length $$rdata) {
1205 utf8::decode (my $decname = $filename);
955 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
956 $filename, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
957 1209
958 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
959 chmod SAVE_MODE, $fh; 1211 aio_chmod $fh, SAVE_MODE;
960 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 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;
1215 aio_fsync $fh;
1216 }
962 close $fh; 1217 aio_close $fh;
963 1218
964 if (@$objs) { 1219 if (@$objs) {
965 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1220 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
966 chmod SAVE_MODE, $fh; 1221 aio_chmod $fh, SAVE_MODE;
967 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1222 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
968 aio_write $fh, 0, (length $data), $data, 0; 1223 aio_write $fh, 0, (length $data), $data, 0;
969 aio_fsync $fh if $cf::USE_FSYNC; 1224 if ($cf::USE_FSYNC) {
1225 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;
1226 aio_fsync $fh;
1227 }
970 close $fh; 1228 aio_close $fh;
971 aio_rename "$filename.pst~", "$filename.pst"; 1229 aio_rename "$filename.pst~", "$filename.pst";
972 } 1230 }
973 } else { 1231 } else {
974 aio_unlink "$filename.pst"; 1232 aio_unlink "$filename.pst";
975 } 1233 }
976 1234
977 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1236
1237 $filename =~ s%/[^/]+$%%;
1238 aio_pathsync $filename if $cf::USE_FSYNC;
978 } else { 1239 } else {
979 warn "FATAL: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
980 } 1241 }
981 } else { 1242 } else {
982 aio_unlink $filename; 1243 aio_unlink $filename;
983 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
984 } 1245 }
985 } 1246 };
986} 1247}
987 1248
988sub object_freezer_as_string { 1249sub object_freezer_as_string {
989 my ($rdata, $objs) = @_; 1250 my ($rdata, $objs) = @_;
990 1251
1002 or return; 1263 or return;
1003 1264
1004 unless (aio_stat "$filename.pst") { 1265 unless (aio_stat "$filename.pst") {
1005 (aio_load "$filename.pst", $av) >= 0 1266 (aio_load "$filename.pst", $av) >= 0
1006 or return; 1267 or return;
1268
1007 $av = eval { (Storable::thaw $av)->{objs} }; 1269 my $st = eval { Coro::Storable::thaw $av };
1270 $av = $st->{objs};
1008 } 1271 }
1009 1272
1273 utf8::decode (my $decname = $filename);
1010 warn sprintf "loading %s (%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1011 $filename, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1277
1012 return ($data, $av); 1278 ($data, $av)
1013} 1279}
1014 1280
1015=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1016 1282
1017=over 4 1283=over 4
1071 my ($name, $cb) = @_; 1337 my ($name, $cb) = @_;
1072 1338
1073 $EXTICMD{$name} = $cb; 1339 $EXTICMD{$name} = $cb;
1074} 1340}
1075 1341
1342use File::Glob ();
1343
1076cf::player->attach ( 1344cf::player->attach (
1077 on_command => sub { 1345 on_unknown_command => sub {
1078 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1079 1347
1080 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1081 or return; 1349 or return;
1082 1350
1087 cf::override; 1355 cf::override;
1088 }, 1356 },
1089 on_extcmd => sub { 1357 on_extcmd => sub {
1090 my ($pl, $buf) = @_; 1358 my ($pl, $buf) = @_;
1091 1359
1092 my $msg = eval { from_json $buf }; 1360 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1093 1361
1094 if (ref $msg) { 1362 if (ref $msg) {
1363 my ($type, $reply, @payload) =
1364 "ARRAY" eq ref $msg
1365 ? @$msg
1366 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1367
1368 my @reply;
1369
1095 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1370 if (my $cb = $EXTCMD{$type}) {
1096 if (my %reply = $cb->($pl, $msg)) { 1371 @reply = $cb->($pl, @payload);
1097 $pl->ext_reply ($msg->{msgid}, %reply);
1098 }
1099 } 1372 }
1373
1374 $pl->ext_reply ($reply, @reply)
1375 if $reply;
1376
1100 } else { 1377 } else {
1101 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1102 } 1379 }
1103 1380
1104 cf::override; 1381 cf::override;
1105 }, 1382 },
1106); 1383);
1107 1384
1385# "readahead" all extensions
1386sub cache_extensions {
1387 my $grp = IO::AIO::aio_group;
1388
1389 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1390 for (grep /\.ext$/, @{$_[0]}) {
1391 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1392 }
1393 };
1394
1395 $grp
1396}
1397
1108sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1109 cf::sync_job { 1401 cf::sync_job {
1110 my %todo; 1402 my %todo;
1111 1403
1112 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1113 next unless -r $path; 1405 next unless -r $path;
1131 1423
1132 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1133 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1134 1426
1135 $ext{source} = 1427 $ext{source} =
1136 "package $pkg; use strict; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1137 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1138 . $source 1430 . $source
1139 . "\n};\n1"; 1431 . "\n};\n1";
1140 1432
1141 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1142 } 1434 }
1143 1435
1436 my $pass = 0;
1144 my %done; 1437 my %done;
1145 while (%todo) { 1438 while (%todo) {
1146 my $progress; 1439 my $progress;
1147 1440
1441 ++$pass;
1442
1443 ext:
1148 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1149 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1150 goto skip 1446 next ext
1151 unless exists $done{$_}; 1447 unless exists $done{$_};
1152 } 1448 }
1153 1449
1154 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1155 1451
1156 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1157 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1158 : "$v->{base}: extension inactive.\n";
1159 1456
1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1160 if (exists $v->{meta}{mandatory}) { 1458 if exists $v->{meta}{mandatory};
1161 warn $msg; 1459
1162 warn "mandatory extension failed to load, exiting.\n"; 1460 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1163 exit 1; 1461 delete $todo{$k};
1164 } 1462 } else {
1165 1463 $done{$k} = delete $todo{$k};
1166 warn $msg; 1464 push @EXTS, $v->{pkg};
1465 $progress = 1;
1466
1467 info "$v->{base}: extension inactive.\n"
1468 unless $active;
1167 } 1469 }
1168
1169 $done{$k} = delete $todo{$k};
1170 push @EXTS, $v->{pkg};
1171 $progress = 1;
1172 } 1470 }
1173 1471
1174 skip: 1472 unless ($progress) {
1175 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1473 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1176 unless $progress; 1474
1475 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory};
1478 }
1479 }
1177 } 1480 }
1178 }; 1481 };
1179} 1482}
1180 1483
1181############################################################################# 1484#############################################################################
1182 1485
1183=back 1486=back
1184 1487
1185=head2 CORE EXTENSIONS 1488=head2 CORE EXTENSIONS
1186 1489
1187Functions and methods that extend core crossfire objects. 1490Functions and methods that extend core deliantra objects.
1188 1491
1189=cut 1492=cut
1190 1493
1191package cf::player; 1494package cf::player;
1192 1495
1193use Coro::AIO; 1496use Coro::AIO;
1194 1497
1195=head3 cf::player 1498=head3 cf::player
1196 1499
1197=over 4 1500=over 4
1501
1502=item cf::player::num_playing
1503
1504Returns the official number of playing players, as per the Crossfire metaserver rules.
1505
1506=cut
1507
1508sub num_playing {
1509 scalar grep
1510 $_->ob->map
1511 && !$_->hidden
1512 && !$_->ob->flag (cf::FLAG_WIZ),
1513 cf::player::list
1514}
1198 1515
1199=item cf::player::find $login 1516=item cf::player::find $login
1200 1517
1201Returns the given player object, loading it if necessary (might block). 1518Returns the given player object, loading it if necessary (might block).
1202 1519
1221 1538
1222sub exists($) { 1539sub exists($) {
1223 my ($login) = @_; 1540 my ($login) = @_;
1224 1541
1225 $cf::PLAYER{$login} 1542 $cf::PLAYER{$login}
1226 or cf::sync_job { !aio_stat path $login } 1543 or !aio_stat path $login
1227} 1544}
1228 1545
1229sub find($) { 1546sub find($) {
1230 return $cf::PLAYER{$_[0]} || do { 1547 return $cf::PLAYER{$_[0]} || do {
1231 my $login = $_[0]; 1548 my $login = $_[0];
1238 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1555 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1239 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1556 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1240 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1557 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1241 aio_unlink +(playerdir $login) . "/$login.pl"; 1558 aio_unlink +(playerdir $login) . "/$login.pl";
1242 1559
1243 my $pl = load_pl path $login 1560 my $f = new_from_file cf::object::thawer path $login
1244 or return; 1561 or return;
1562
1563 my $pl = cf::player::load_pl $f
1564 or return;
1565
1566 local $cf::PLAYER_LOADING{$login} = $pl;
1567 $f->resolve_delayed_derefs;
1245 $cf::PLAYER{$login} = $pl 1568 $cf::PLAYER{$login} = $pl
1246 } 1569 }
1247 } 1570 }
1248} 1571}
1572
1573cf::player->attach (
1574 on_load => sub {
1575 my ($pl, $path) = @_;
1576
1577 # restore slots saved in save, below
1578 my $slots = delete $pl->{_slots};
1579
1580 $pl->ob->current_weapon ($slots->[0]);
1581 $pl->combat_ob ($slots->[1]);
1582 $pl->ranged_ob ($slots->[2]);
1583 },
1584);
1249 1585
1250sub save($) { 1586sub save($) {
1251 my ($pl) = @_; 1587 my ($pl) = @_;
1252 1588
1253 return if $pl->{deny_save}; 1589 return if $pl->{deny_save};
1258 return if $pl->{deny_save}; 1594 return if $pl->{deny_save};
1259 1595
1260 aio_mkdir playerdir $pl, 0770; 1596 aio_mkdir playerdir $pl, 0770;
1261 $pl->{last_save} = $cf::RUNTIME; 1597 $pl->{last_save} = $cf::RUNTIME;
1262 1598
1599 cf::get_slot 0.01;
1600
1601 # save slots, to be restored later
1602 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1603
1263 $pl->save_pl ($path); 1604 $pl->save_pl ($path);
1264 Coro::cede; 1605 cf::cede_to_tick;
1265} 1606}
1266 1607
1267sub new($) { 1608sub new($) {
1268 my ($login) = @_; 1609 my ($login) = @_;
1269 1610
1275 $cf::PLAYER{$login} = $self; 1616 $cf::PLAYER{$login} = $self;
1276 1617
1277 $self 1618 $self
1278} 1619}
1279 1620
1621=item $player->send_msg ($channel, $msg, $color, [extra...])
1622
1623=cut
1624
1625sub send_msg {
1626 my $ns = shift->ns
1627 or return;
1628 $ns->send_msg (@_);
1629}
1630
1280=item $pl->quit_character 1631=item $pl->quit_character
1281 1632
1282Nukes the player without looking back. If logged in, the connection will 1633Nukes the player without looking back. If logged in, the connection will
1283be destroyed. May block for a long time. 1634be destroyed. May block for a long time.
1284 1635
1288 my ($pl) = @_; 1639 my ($pl) = @_;
1289 1640
1290 my $name = $pl->ob->name; 1641 my $name = $pl->ob->name;
1291 1642
1292 $pl->{deny_save} = 1; 1643 $pl->{deny_save} = 1;
1293 $pl->password ("*"); # this should lock out the player until we nuked the dir 1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1294 1645
1295 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1296 $pl->deactivate; 1647 $pl->deactivate;
1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1297 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1649 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1298 $pl->ns->destroy if $pl->ns; 1650 $pl->ns->destroy if $pl->ns;
1299 1651
1300 my $path = playerdir $pl; 1652 my $path = playerdir $pl;
1301 my $temp = "$path~$cf::RUNTIME~deleting~"; 1653 my $temp = "$path~$cf::RUNTIME~deleting~";
1337 or return []; 1689 or return [];
1338 1690
1339 my @logins; 1691 my @logins;
1340 1692
1341 for my $login (@$dirs) { 1693 for my $login (@$dirs) {
1694 my $path = path $login;
1695
1696 # a .pst is a dead give-away for a valid player
1697 # if no pst file found, open and chekc for blocked users
1698 if (aio_stat "$path.pst") {
1342 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1699 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1343 aio_read $fh, 0, 512, my $buf, 0 or next; 1700 aio_read $fh, 0, 512, my $buf, 0 or next;
1344 $buf !~ /^password -------------$/m or next; # official not-valid tag 1701 $buf !~ /^password -------------$/m or next; # official not-valid tag
1702 }
1345 1703
1346 utf8::decode $login; 1704 utf8::decode $login;
1347 push @logins, $login; 1705 push @logins, $login;
1348 } 1706 }
1349 1707
1350 \@logins 1708 \@logins
1351} 1709}
1352 1710
1353=item $player->maps 1711=item $player->maps
1712
1713=item cf::player::maps $login
1354 1714
1355Returns an arrayref of map paths that are private for this 1715Returns an arrayref of map paths that are private for this
1356player. May block. 1716player. May block.
1357 1717
1358=cut 1718=cut
1376 } 1736 }
1377 1737
1378 \@paths 1738 \@paths
1379} 1739}
1380 1740
1381=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1741=item $protocol_xml = $player->expand_cfpod ($cfpod)
1382 1742
1383Expand crossfire pod fragments into protocol xml. 1743Expand deliantra pod fragments into protocol xml.
1384 1744
1385=cut
1386
1387sub expand_cfpod {
1388 ((my $self), (local $_)) = @_;
1389
1390 # escape & and <
1391 s/&/&amp;/g;
1392 s/(?<![BIUGH])</&lt;/g;
1393
1394 # this is buggy, it needs to properly take care of nested <'s
1395
1396 1 while
1397 # replace B<>, I<>, U<> etc.
1398 s/B<([^\>]*)>/<b>$1<\/b>/
1399 || s/I<([^\>]*)>/<i>$1<\/i>/
1400 || s/U<([^\>]*)>/<u>$1<\/u>/
1401 # replace G<male|female> tags
1402 || s{G<([^>|]*)\|([^>]*)>}{
1403 $self->gender ? $2 : $1
1404 }ge
1405 # replace H<hint text>
1406 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1407
1408 # create single paragraphs (very hackish)
1409 s/(?<=\S)\n(?=\w)/ /g;
1410
1411 $_
1412}
1413
1414=item $player->ext_reply ($msgid, %msg) 1745=item $player->ext_reply ($msgid, @msg)
1415 1746
1416Sends an ext reply to the player. 1747Sends an ext reply to the player.
1417 1748
1418=cut 1749=cut
1419 1750
1420sub ext_reply($$%) { 1751sub ext_reply($$@) {
1421 my ($self, $id, %msg) = @_; 1752 my ($self, $id, @msg) = @_;
1422 1753
1423 $msg{msgid} = $id; 1754 $self->ns->ext_reply ($id, @msg)
1424 $self->send ("ext " . cf::to_json \%msg);
1425} 1755}
1426 1756
1427=item $player->ext_event ($type, %msg) 1757=item $player->ext_msg ($type, @msg)
1428 1758
1429Sends an ext event to the client. 1759Sends an ext event to the client.
1430 1760
1431=cut 1761=cut
1432 1762
1433sub ext_event($$%) { 1763sub ext_msg($$@) {
1434 my ($self, $type, %msg) = @_; 1764 my ($self, $type, @msg) = @_;
1435 1765
1436 $self->ns->ext_event ($type, %msg); 1766 $self->ns->ext_msg ($type, @msg);
1437} 1767}
1438 1768
1439=head3 cf::region 1769=head3 cf::region
1440 1770
1441=over 4 1771=over 4
1451=cut 1781=cut
1452 1782
1453sub find_by_path($) { 1783sub find_by_path($) {
1454 my ($path) = @_; 1784 my ($path) = @_;
1455 1785
1786 $path =~ s/^~[^\/]*//; # skip ~login
1787
1456 my ($match, $specificity); 1788 my ($match, $specificity);
1457 1789
1458 for my $region (list) { 1790 for my $region (list) {
1459 if ($region->match && $path =~ $region->match) { 1791 if ($region->{match} && $path =~ $region->{match}) {
1460 ($match, $specificity) = ($region, $region->specificity) 1792 ($match, $specificity) = ($region, $region->specificity)
1461 if $region->specificity > $specificity; 1793 if $region->specificity > $specificity;
1462 } 1794 }
1463 } 1795 }
1464 1796
1485our $MAX_RESET = 3600; 1817our $MAX_RESET = 3600;
1486our $DEFAULT_RESET = 3000; 1818our $DEFAULT_RESET = 3000;
1487 1819
1488sub generate_random_map { 1820sub generate_random_map {
1489 my ($self, $rmp) = @_; 1821 my ($self, $rmp) = @_;
1822
1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1824
1490 # mit "rum" bekleckern, nicht 1825 # mit "rum" bekleckern, nicht
1491 $self->_create_random_map ( 1826 $self->_create_random_map (
1492 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1493 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1494 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1495 $rmp->{exit_on_final_map}, 1830 $rmp->{exit_on_final_map},
1496 $rmp->{xsize}, $rmp->{ysize}, 1831 $rmp->{xsize}, $rmp->{ysize},
1497 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1498 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1513 1848
1514sub register { 1849sub register {
1515 my (undef, $regex, $prio) = @_; 1850 my (undef, $regex, $prio) = @_;
1516 my $pkg = caller; 1851 my $pkg = caller;
1517 1852
1518 no strict;
1519 push @{"$pkg\::ISA"}, __PACKAGE__; 1853 push @{"$pkg\::ISA"}, __PACKAGE__;
1520 1854
1521 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1855 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1522} 1856}
1523 1857
1524# also paths starting with '/' 1858# also paths starting with '/'
1525$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1859$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1526 1860
1527sub thawer_merge { 1861sub thawer_merge {
1528 my ($self, $merge) = @_; 1862 my ($self, $merge) = @_;
1529 1863
1530 # we have to keep some variables in memory intact 1864 # we have to keep some variables in memory intact
1535} 1869}
1536 1870
1537sub normalise { 1871sub normalise {
1538 my ($path, $base) = @_; 1872 my ($path, $base) = @_;
1539 1873
1540 $path = "$path"; # make sure its a string 1874 $path = "$path"; # make sure it's a string
1541 1875
1542 $path =~ s/\.map$//; 1876 $path =~ s/\.map$//;
1543 1877
1544 # map plan: 1878 # map plan:
1545 # 1879 #
1584 $self->init; # pass $1 etc. 1918 $self->init; # pass $1 etc.
1585 return $self; 1919 return $self;
1586 } 1920 }
1587 } 1921 }
1588 1922
1589 Carp::carp "unable to resolve path '$path' (base '$base')."; 1923 Carp::cluck "unable to resolve path '$path' (base '$base')";
1590 () 1924 ()
1591} 1925}
1592 1926
1593sub init { 1927sub init {
1594 my ($self) = @_; 1928 my ($self) = @_;
1616 1950
1617# the temporary/swap location 1951# the temporary/swap location
1618sub save_path { 1952sub save_path {
1619 my ($self) = @_; 1953 my ($self) = @_;
1620 1954
1621 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1955 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1622 "$TMPDIR/$path.map" 1956 "$TMPDIR/$path.map"
1623} 1957}
1624 1958
1625# the unique path, undef == no special unique path 1959# the unique path, undef == no special unique path
1626sub uniq_path { 1960sub uniq_path {
1627 my ($self) = @_; 1961 my ($self) = @_;
1628 1962
1629 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1963 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1630 "$UNIQUEDIR/$path" 1964 "$UNIQUEDIR/$path"
1631}
1632
1633# and all this just because we cannot iterate over
1634# all maps in C++...
1635sub change_all_map_light {
1636 my ($change) = @_;
1637
1638 $_->change_map_light ($change)
1639 for grep $_->outdoor, values %cf::MAP;
1640} 1965}
1641 1966
1642sub decay_objects { 1967sub decay_objects {
1643 my ($self) = @_; 1968 my ($self) = @_;
1644 1969
1657 1982
1658sub load_header_from($) { 1983sub load_header_from($) {
1659 my ($self, $path) = @_; 1984 my ($self, $path) = @_;
1660 1985
1661 utf8::encode $path; 1986 utf8::encode $path;
1662 #aio_open $path, O_RDONLY, 0 1987 my $f = new_from_file cf::object::thawer $path
1663 # or return;
1664
1665 $self->_load_header ($path)
1666 or return; 1988 or return;
1989
1990 $self->_load_header ($f)
1991 or return;
1992
1993 local $MAP_LOADING{$self->{path}} = $self;
1994 $f->resolve_delayed_derefs;
1667 1995
1668 $self->{load_path} = $path; 1996 $self->{load_path} = $path;
1669 1997
1670 1 1998 1
1671} 1999}
1723 2051
1724sub find; 2052sub find;
1725sub find { 2053sub find {
1726 my ($path, $origin) = @_; 2054 my ($path, $origin) = @_;
1727 2055
2056 cf::cede_to_tick;
2057
1728 $path = normalise $path, $origin && $origin->path; 2058 $path = normalise $path, $origin && $origin->path;
1729 2059
2060 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1730 cf::lock_wait "map_find:$path"; 2061 my $guard2 = cf::lock_acquire "map_find:$path";
1731 2062
1732 $cf::MAP{$path} || do { 2063 $cf::MAP{$path} || do {
1733 my $guard = cf::lock_acquire "map_find:$path";
1734 my $map = new_from_path cf::map $path 2064 my $map = new_from_path cf::map $path
1735 or return; 2065 or return;
1736 2066
1737 $map->{last_save} = $cf::RUNTIME; 2067 $map->{last_save} = $cf::RUNTIME;
1738 2068
1740 or return; 2070 or return;
1741 2071
1742 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2072 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1743 # doing this can freeze the server in a sync job, obviously 2073 # doing this can freeze the server in a sync job, obviously
1744 #$cf::WAIT_FOR_TICK->wait; 2074 #$cf::WAIT_FOR_TICK->wait;
2075 undef $guard2;
2076 undef $guard1;
1745 $map->reset; 2077 $map->reset;
1746 undef $guard;
1747 return find $path; 2078 return find $path;
1748 } 2079 }
1749 2080
1750 $cf::MAP{$path} = $map 2081 $cf::MAP{$path} = $map
1751 } 2082 }
1752} 2083}
1753 2084
1754sub pre_load { } 2085sub pre_load { }
1755sub post_load { } 2086#sub post_load { } # XS
1756 2087
1757sub load { 2088sub load {
1758 my ($self) = @_; 2089 my ($self) = @_;
1759 2090
1760 local $self->{deny_reset} = 1; # loading can take a long time 2091 local $self->{deny_reset} = 1; # loading can take a long time
1761 2092
1762 my $path = $self->{path}; 2093 my $path = $self->{path};
1763 2094
1764 { 2095 {
1765 my $guard = cf::lock_acquire "map_load:$path"; 2096 my $guard = cf::lock_acquire "map_data:$path";
1766 2097
2098 return unless $self->valid;
1767 return if $self->in_memory != cf::MAP_SWAPPED; 2099 return unless $self->in_memory == cf::MAP_SWAPPED;
1768 2100
1769 $self->in_memory (cf::MAP_LOADING); 2101 $self->in_memory (cf::MAP_LOADING);
1770 2102
1771 $self->alloc; 2103 $self->alloc;
1772 2104
1773 $self->pre_load; 2105 $self->pre_load;
1774 Coro::cede; 2106 cf::cede_to_tick;
1775 2107
2108 my $f = new_from_file cf::object::thawer $self->{load_path};
2109 $f->skip_block;
1776 $self->_load_objects ($self->{load_path}, 1) 2110 $self->_load_objects ($f)
1777 or return; 2111 or return;
1778 2112
1779 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2113 $self->post_load_original
1780 if delete $self->{load_original}; 2114 if delete $self->{load_original};
1781 2115
1782 if (my $uniq = $self->uniq_path) { 2116 if (my $uniq = $self->uniq_path) {
1783 utf8::encode $uniq; 2117 utf8::encode $uniq;
1784 if (aio_open $uniq, O_RDONLY, 0) { 2118 unless (aio_stat $uniq) {
2119 if (my $f = new_from_file cf::object::thawer $uniq) {
1785 $self->clear_unique_items; 2120 $self->clear_unique_items;
1786 $self->_load_objects ($uniq, 0); 2121 $self->_load_objects ($f);
2122 $f->resolve_delayed_derefs;
2123 }
1787 } 2124 }
1788 } 2125 }
1789 2126
1790 Coro::cede; 2127 $f->resolve_delayed_derefs;
2128
2129 cf::cede_to_tick;
1791 # now do the right thing for maps 2130 # now do the right thing for maps
1792 $self->link_multipart_objects; 2131 $self->link_multipart_objects;
1793 $self->difficulty ($self->estimate_difficulty) 2132 $self->difficulty ($self->estimate_difficulty)
1794 unless $self->difficulty; 2133 unless $self->difficulty;
1795 Coro::cede; 2134 cf::cede_to_tick;
1796 2135
1797 unless ($self->{deny_activate}) { 2136 unless ($self->{deny_activate}) {
1798 $self->decay_objects; 2137 $self->decay_objects;
1799 $self->fix_auto_apply; 2138 $self->fix_auto_apply;
1800 $self->update_buttons; 2139 $self->update_buttons;
1801 Coro::cede; 2140 cf::cede_to_tick;
1802 $self->set_darkness_map;
1803 Coro::cede;
1804 $self->activate; 2141 $self->activate;
1805 } 2142 }
1806 2143
2144 $self->{last_save} = $cf::RUNTIME;
2145 $self->last_access ($cf::RUNTIME);
2146
1807 $self->in_memory (cf::MAP_IN_MEMORY); 2147 $self->in_memory (cf::MAP_ACTIVE);
1808 } 2148 }
1809 2149
1810 $self->post_load; 2150 $self->post_load;
1811} 2151}
1812 2152
2153# customize the map for a given player, i.e.
2154# return the _real_ map. used by e.g. per-player
2155# maps to change the path to ~playername/mappath
1813sub customise_for { 2156sub customise_for {
1814 my ($self, $ob) = @_; 2157 my ($self, $ob) = @_;
1815 2158
1816 return find "~" . $ob->name . "/" . $self->{path} 2159 return find "~" . $ob->name . "/" . $self->{path}
1817 if $self->per_player; 2160 if $self->per_player;
1821 2164
1822 $self 2165 $self
1823} 2166}
1824 2167
1825# find and load all maps in the 3x3 area around a map 2168# find and load all maps in the 3x3 area around a map
1826sub load_diag { 2169sub load_neighbours {
1827 my ($map) = @_; 2170 my ($map) = @_;
1828 2171
1829 my @diag; # diagonal neighbours 2172 my @neigh; # diagonal neighbours
1830 2173
1831 for (0 .. 3) { 2174 for (0 .. 3) {
1832 my $neigh = $map->tile_path ($_) 2175 my $neigh = $map->tile_path ($_)
1833 or next; 2176 or next;
1834 $neigh = find $neigh, $map 2177 $neigh = find $neigh, $map
1835 or next; 2178 or next;
1836 $neigh->load; 2179 $neigh->load;
1837 2180
2181 # now find the diagonal neighbours
2182 push @neigh,
1838 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2183 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1839 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2184 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1840 } 2185 }
1841 2186
1842 for (@diag) { 2187 for (grep defined $_->[0], @neigh) {
2188 my ($path, $origin) = @$_;
1843 my $neigh = find @$_ 2189 my $neigh = find $path, $origin
1844 or next; 2190 or next;
1845 $neigh->load; 2191 $neigh->load;
1846 } 2192 }
1847} 2193}
1848 2194
1849sub find_sync { 2195sub find_sync {
1850 my ($path, $origin) = @_; 2196 my ($path, $origin) = @_;
1851 2197
1852 cf::sync_job { find $path, $origin } 2198 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2199 if $Coro::current == $Coro::main;
2200
2201 find $path, $origin
1853} 2202}
1854 2203
1855sub do_load_sync { 2204sub do_load_sync {
1856 my ($map) = @_; 2205 my ($map) = @_;
1857 2206
1858 cf::sync_job { $map->load }; 2207 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2208 if $Coro::current == $Coro::main;
2209
2210 $map->load;
1859} 2211}
1860 2212
1861our %MAP_PREFETCH; 2213our %MAP_PREFETCH;
1862our $MAP_PREFETCHER = undef; 2214our $MAP_PREFETCHER = undef;
1863 2215
1864sub find_async { 2216sub find_async {
1865 my ($path, $origin) = @_; 2217 my ($path, $origin, $load) = @_;
1866 2218
1867 $path = normalise $path, $origin && $origin->{path}; 2219 $path = normalise $path, $origin && $origin->{path};
1868 2220
1869 if (my $map = $cf::MAP{$path}) { 2221 if (my $map = $cf::MAP{$path}) {
1870 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2222 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1871 } 2223 }
1872 2224
1873 undef $MAP_PREFETCH{$path}; 2225 $MAP_PREFETCH{$path} |= $load;
2226
1874 $MAP_PREFETCHER ||= cf::async { 2227 $MAP_PREFETCHER ||= cf::async {
2228 $Coro::current->{desc} = "map prefetcher";
2229
1875 while (%MAP_PREFETCH) { 2230 while (%MAP_PREFETCH) {
1876 for my $path (keys %MAP_PREFETCH) { 2231 while (my ($k, $v) = each %MAP_PREFETCH) {
1877 my $map = find $path 2232 if (my $map = find $k) {
1878 or next;
1879 $map->load; 2233 $map->load if $v;
2234 }
1880 2235
1881 delete $MAP_PREFETCH{$path}; 2236 delete $MAP_PREFETCH{$k};
1882 } 2237 }
1883 } 2238 }
1884 undef $MAP_PREFETCHER; 2239 undef $MAP_PREFETCHER;
1885 }; 2240 };
1886 $MAP_PREFETCHER->prio (6); 2241 $MAP_PREFETCHER->prio (6);
1887 2242
1888 () 2243 ()
1889} 2244}
1890 2245
2246# common code, used by both ->save and ->swapout
1891sub save { 2247sub _save {
1892 my ($self) = @_; 2248 my ($self) = @_;
1893
1894 my $lock = cf::lock_acquire "map_data:" . $self->path;
1895 2249
1896 $self->{last_save} = $cf::RUNTIME; 2250 $self->{last_save} = $cf::RUNTIME;
1897 2251
1898 return unless $self->dirty; 2252 return unless $self->dirty;
1899 2253
1905 return if $self->{deny_save}; 2259 return if $self->{deny_save};
1906 2260
1907 local $self->{last_access} = $self->last_access;#d# 2261 local $self->{last_access} = $self->last_access;#d#
1908 2262
1909 cf::async { 2263 cf::async {
2264 $Coro::current->{desc} = "map player save";
1910 $_->contr->save for $self->players; 2265 $_->contr->save for $self->players;
1911 }; 2266 };
2267
2268 cf::get_slot 0.02;
1912 2269
1913 if ($uniq) { 2270 if ($uniq) {
1914 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2271 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1915 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2272 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1916 } else { 2273 } else {
1917 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2274 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1918 } 2275 }
1919} 2276}
1920 2277
2278sub save {
2279 my ($self) = @_;
2280
2281 my $lock = cf::lock_acquire "map_data:$self->{path}";
2282
2283 $self->_save;
2284}
2285
1921sub swap_out { 2286sub swap_out {
1922 my ($self) = @_; 2287 my ($self) = @_;
1923 2288
1924 # save first because save cedes
1925 $self->save;
1926
1927 my $lock = cf::lock_acquire "map_data:" . $self->path; 2289 my $lock = cf::lock_acquire "map_data:$self->{path}";
1928 2290
2291 return if $self->in_memory != cf::MAP_ACTIVE;
2292 return if $self->{deny_save};
1929 return if $self->players; 2293 return if $self->players;
1930 return if $self->in_memory != cf::MAP_IN_MEMORY;
1931 return if $self->{deny_save};
1932 2294
2295 # first deactivate the map and "unlink" it from the core
2296 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP;
2298 $self->in_memory (cf::MAP_SWAPPED);
2299
2300 # then atomically save
2301 $self->_save;
2302
2303 # then free the map
1933 $self->clear; 2304 $self->clear;
1934 $self->in_memory (cf::MAP_SWAPPED);
1935} 2305}
1936 2306
1937sub reset_at { 2307sub reset_at {
1938 my ($self) = @_; 2308 my ($self) = @_;
1939 2309
1957 2327
1958 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2328 my $lock = cf::lock_acquire "map_data:$self->{path}";
1959 2329
1960 return if $self->players; 2330 return if $self->players;
1961 2331
1962 warn "resetting map ", $self->path; 2332 cf::trace "resetting map ", $self->path, "\n";
1963 2333
1964 $self->in_memory (cf::MAP_SWAPPED); 2334 $self->in_memory (cf::MAP_SWAPPED);
1965 2335
1966 # need to save uniques path 2336 # need to save uniques path
1967 unless ($self->{deny_save}) { 2337 unless ($self->{deny_save}) {
1971 if $uniq; 2341 if $uniq;
1972 } 2342 }
1973 2343
1974 delete $cf::MAP{$self->path}; 2344 delete $cf::MAP{$self->path};
1975 2345
2346 $self->deactivate;
2347 $_->clear_links_to ($self) for values %cf::MAP;
1976 $self->clear; 2348 $self->clear;
1977
1978 $_->clear_links_to ($self) for values %cf::MAP;
1979 2349
1980 $self->unlink_save; 2350 $self->unlink_save;
1981 $self->destroy; 2351 $self->destroy;
1982} 2352}
1983 2353
1984my $nuke_counter = "aaaa"; 2354my $nuke_counter = "aaaa";
1985 2355
1986sub nuke { 2356sub nuke {
1987 my ($self) = @_; 2357 my ($self) = @_;
1988 2358
2359 {
2360 my $lock = cf::lock_acquire "map_data:$self->{path}";
2361
1989 delete $cf::MAP{$self->path}; 2362 delete $cf::MAP{$self->path};
1990 2363
1991 $self->unlink_save; 2364 $self->unlink_save;
1992 2365
1993 bless $self, "cf::map"; 2366 bless $self, "cf::map::wrap";
1994 delete $self->{deny_reset}; 2367 delete $self->{deny_reset};
1995 $self->{deny_save} = 1; 2368 $self->{deny_save} = 1;
1996 $self->reset_timeout (1); 2369 $self->reset_timeout (1);
1997 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2370 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1998 2371
1999 $cf::MAP{$self->path} = $self; 2372 $cf::MAP{$self->path} = $self;
2373 }
2000 2374
2001 $self->reset; # polite request, might not happen 2375 $self->reset; # polite request, might not happen
2002} 2376}
2003 2377
2004=item $maps = cf::map::tmp_maps 2378=item $maps = cf::map::tmp_maps
2046 2420
2047sub unique_maps() { 2421sub unique_maps() {
2048 [ 2422 [
2049 map { 2423 map {
2050 utf8::decode $_; 2424 utf8::decode $_;
2051 /\.map$/ 2425 s/\.map$//; # TODO future compatibility hack
2426 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2427 ? ()
2052 ? normalise $_ 2428 : normalise $_
2053 : ()
2054 } @{ aio_readdir $UNIQUEDIR or [] } 2429 } @{ aio_readdir $UNIQUEDIR or [] }
2055 ] 2430 ]
2056} 2431}
2057 2432
2058package cf; 2433=item cf::map::static_maps
2434
2435Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2436file in the shared directory excluding F</styles> and F</editor>). May
2437block.
2438
2439=cut
2440
2441sub static_maps() {
2442 my @dirs = "";
2443 my @maps;
2444
2445 while (@dirs) {
2446 my $dir = shift @dirs;
2447
2448 next if $dir eq "/styles" || $dir eq "/editor";
2449
2450 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2451 or return;
2452
2453 for (@$files) {
2454 s/\.map$// or next;
2455 utf8::decode $_;
2456 push @maps, "$dir/$_";
2457 }
2458
2459 push @dirs, map "$dir/$_", @$dirs;
2460 }
2461
2462 \@maps
2463}
2059 2464
2060=back 2465=back
2061 2466
2062=head3 cf::object 2467=head3 cf::object
2063 2468
2067 2472
2068=over 4 2473=over 4
2069 2474
2070=item $ob->inv_recursive 2475=item $ob->inv_recursive
2071 2476
2072Returns the inventory of the object _and_ their inventories, recursively. 2477Returns the inventory of the object I<and> their inventories, recursively,
2478but I<not> the object itself.
2073 2479
2074=cut 2480=cut
2075 2481
2076sub inv_recursive_; 2482sub inv_recursive_;
2077sub inv_recursive_ { 2483sub inv_recursive_ {
2080 2486
2081sub inv_recursive { 2487sub inv_recursive {
2082 inv_recursive_ inv $_[0] 2488 inv_recursive_ inv $_[0]
2083} 2489}
2084 2490
2491=item $ref = $ob->ref
2492
2493Creates and returns a persistent reference to an object that can be stored as a string.
2494
2495=item $ob = cf::object::deref ($refstring)
2496
2497returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2498even if the object actually exists. May block.
2499
2500=cut
2501
2502sub deref {
2503 my ($ref) = @_;
2504
2505 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2506 my ($uuid, $name) = ($1, $2);
2507 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2508 or return;
2509 $pl->ob->uuid eq $uuid
2510 or return;
2511
2512 $pl->ob
2513 } else {
2514 warn "$ref: cannot resolve object reference\n";
2515 undef
2516 }
2517}
2518
2085package cf; 2519package cf;
2086 2520
2087=back 2521=back
2088 2522
2089=head3 cf::object::player 2523=head3 cf::object::player
2095Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2529Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2096can be C<undef>. Does the right thing when the player is currently in a 2530can be C<undef>. Does the right thing when the player is currently in a
2097dialogue with the given NPC character. 2531dialogue with the given NPC character.
2098 2532
2099=cut 2533=cut
2534
2535our $SAY_CHANNEL = {
2536 id => "say",
2537 title => "Map",
2538 reply => "say ",
2539 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2540};
2541
2542our $CHAT_CHANNEL = {
2543 id => "chat",
2544 title => "Chat",
2545 reply => "chat ",
2546 tooltip => "Player chat and shouts, global to the server.",
2547};
2100 2548
2101# rough implementation of a future "reply" method that works 2549# rough implementation of a future "reply" method that works
2102# with dialog boxes. 2550# with dialog boxes.
2103#TODO: the first argument must go, split into a $npc->reply_to ( method 2551#TODO: the first argument must go, split into a $npc->reply_to ( method
2104sub cf::object::player::reply($$$;$) { 2552sub cf::object::player::reply($$$;$) {
2111 2559
2112 } else { 2560 } else {
2113 my $pl = $self->contr; 2561 my $pl = $self->contr;
2114 2562
2115 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2563 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2116 my $diag = $pl->{npc_dialog}; 2564 my $dialog = $pl->{npc_dialog};
2117 $diag->{pl}->ext_reply ( 2565 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2118 $diag->{id},
2119 msgtype => "reply",
2120 msg => $diag->{pl}->expand_cfpod ($msg),
2121 add_topics => []
2122 );
2123 2566
2124 } else { 2567 } else {
2125 $msg = $npc->name . " says: $msg" if $npc; 2568 $msg = $npc->name . " says: $msg" if $npc;
2126 $self->message ($msg, $flags); 2569 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2127 } 2570 }
2128 } 2571 }
2572}
2573
2574=item $object->send_msg ($channel, $msg, $color, [extra...])
2575
2576=cut
2577
2578sub cf::object::send_msg {
2579 my $pl = shift->contr
2580 or return;
2581 $pl->send_msg (@_);
2129} 2582}
2130 2583
2131=item $player_object->may ("access") 2584=item $player_object->may ("access")
2132 2585
2133Returns wether the given player is authorized to access resource "access" 2586Returns wether the given player is authorized to access resource "access"
2146 2599
2147=item $player_object->enter_link 2600=item $player_object->enter_link
2148 2601
2149Freezes the player and moves him/her to a special map (C<{link}>). 2602Freezes the player and moves him/her to a special map (C<{link}>).
2150 2603
2151The player should be reasonably safe there for short amounts of time. You 2604The player should be reasonably safe there for short amounts of time (e.g.
2152I<MUST> call C<leave_link> as soon as possible, though. 2605for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2606though, as the player cannot control the character while it is on the link
2607map.
2153 2608
2154Will never block. 2609Will never block.
2155 2610
2156=item $player_object->leave_link ($map, $x, $y) 2611=item $player_object->leave_link ($map, $x, $y)
2157 2612
2177sub cf::object::player::enter_link { 2632sub cf::object::player::enter_link {
2178 my ($self) = @_; 2633 my ($self) = @_;
2179 2634
2180 $self->deactivate_recursive; 2635 $self->deactivate_recursive;
2181 2636
2637 ++$self->{_link_recursion};
2638
2182 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2639 return if UNIVERSAL::isa $self->map, "ext::map_link";
2183 2640
2184 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2641 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2185 if $self->map && $self->map->{path} ne "{link}"; 2642 if $self->map && $self->map->{path} ne "{link}";
2186 2643
2187 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2644 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2188} 2645}
2189 2646
2190sub cf::object::player::leave_link { 2647sub cf::object::player::leave_link {
2191 my ($self, $map, $x, $y) = @_; 2648 my ($self, $map, $x, $y) = @_;
2192 2649
2209 ($x, $y) = (-1, -1) 2666 ($x, $y) = (-1, -1)
2210 unless (defined $x) && (defined $y); 2667 unless (defined $x) && (defined $y);
2211 2668
2212 # use -1 or undef as default coordinates, not 0, 0 2669 # use -1 or undef as default coordinates, not 0, 0
2213 ($x, $y) = ($map->enter_x, $map->enter_y) 2670 ($x, $y) = ($map->enter_x, $map->enter_y)
2214 if $x <=0 && $y <= 0; 2671 if $x <= 0 && $y <= 0;
2215 2672
2216 $map->load; 2673 $map->load;
2217 $map->load_diag; 2674 $map->load_neighbours;
2218 2675
2219 return unless $self->contr->active; 2676 return unless $self->contr->active;
2220 $self->activate_recursive;
2221 2677
2222 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2678 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223 $self->enter_map ($map, $x, $y); 2679 if ($self->enter_map ($map, $x, $y)) {
2224} 2680 # entering was successful
2681 delete $self->{_link_recursion};
2682 # only activate afterwards, to support waiting in hooks
2683 $self->activate_recursive;
2684 }
2225 2685
2686}
2687
2226=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2688=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2227 2689
2228Moves the player to the given map-path and coordinates by first freezing 2690Moves the player to the given map-path and coordinates by first freezing
2229her, loading and preparing them map, calling the provided $check callback 2691her, loading and preparing them map, calling the provided $check callback
2230that has to return the map if sucecssful, and then unfreezes the player on 2692that has to return the map if sucecssful, and then unfreezes the player on
2231the new (success) or old (failed) map position. 2693the new (success) or old (failed) map position. In either case, $done will
2694be called at the end of this process.
2695
2696Note that $check will be called with a potentially non-loaded map, so if
2697it needs a loaded map it has to call C<< ->load >>.
2232 2698
2233=cut 2699=cut
2234 2700
2235our $GOTOGEN; 2701our $GOTOGEN;
2236 2702
2237sub cf::object::player::goto { 2703sub cf::object::player::goto {
2238 my ($self, $path, $x, $y, $check) = @_; 2704 my ($self, $path, $x, $y, $check, $done) = @_;
2705
2706 if ($self->{_link_recursion} >= $MAX_LINKS) {
2707 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2708 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2709 ($path, $x, $y) = @$EMERGENCY_POSITION;
2710 }
2239 2711
2240 # do generation counting so two concurrent goto's will be executed in-order 2712 # do generation counting so two concurrent goto's will be executed in-order
2241 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2713 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242 2714
2243 $self->enter_link; 2715 $self->enter_link;
2244 2716
2245 (async { 2717 (async {
2718 $Coro::current->{desc} = "player::goto $path $x $y";
2719
2720 # *tag paths override both path and x|y
2721 if ($path =~ /^\*(.*)$/) {
2722 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2723 my $ob = $obs[rand @obs];
2724
2725 # see if we actually can go there
2726 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2727 $ob = $obs[rand @obs];
2728 } else {
2729 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2730 }
2731 # else put us there anyways for now #d#
2732
2733 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2734 } else {
2735 ($path, $x, $y) = (undef, undef, undef);
2736 }
2737 }
2738
2246 my $map = eval { 2739 my $map = eval {
2247 my $map = cf::map::find $path; 2740 my $map = defined $path ? cf::map::find $path : undef;
2248 2741
2249 if ($map) { 2742 if ($map) {
2250 $map = $map->customise_for ($self); 2743 $map = $map->customise_for ($self);
2251 $map = $check->($map) if $check && $map; 2744 $map = $check->($map, $x, $y, $self) if $check && $map;
2252 } else { 2745 } else {
2253 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2746 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2254 } 2747 }
2255 2748
2256 $map 2749 $map
2257 }; 2750 };
2258 2751
2263 2756
2264 if ($gen == $self->{_goto_generation}) { 2757 if ($gen == $self->{_goto_generation}) {
2265 delete $self->{_goto_generation}; 2758 delete $self->{_goto_generation};
2266 $self->leave_link ($map, $x, $y); 2759 $self->leave_link ($map, $x, $y);
2267 } 2760 }
2761
2762 $done->($self) if $done;
2268 })->prio (1); 2763 })->prio (1);
2269} 2764}
2270 2765
2271=item $player_object->enter_exit ($exit_object) 2766=item $player_object->enter_exit ($exit_object)
2272 2767
2292} 2787}
2293 2788
2294sub prepare_random_map { 2789sub prepare_random_map {
2295 my ($exit) = @_; 2790 my ($exit) = @_;
2296 2791
2297 my $guard = cf::lock_acquire "exit_prepare:$exit";
2298
2299 # all this does is basically replace the /! path by 2792 # all this does is basically replace the /! path by
2300 # a new random map path (?random/...) with a seed 2793 # a new random map path (?random/...) with a seed
2301 # that depends on the exit object 2794 # that depends on the exit object
2302 2795
2303 my $rmp = parse_random_map_params $exit->msg; 2796 my $rmp = parse_random_map_params $exit->msg;
2305 if ($exit->map) { 2798 if ($exit->map) {
2306 $rmp->{region} = $exit->region->name; 2799 $rmp->{region} = $exit->region->name;
2307 $rmp->{origin_map} = $exit->map->path; 2800 $rmp->{origin_map} = $exit->map->path;
2308 $rmp->{origin_x} = $exit->x; 2801 $rmp->{origin_x} = $exit->x;
2309 $rmp->{origin_y} = $exit->y; 2802 $rmp->{origin_y} = $exit->y;
2803
2804 $exit->map->touch;
2310 } 2805 }
2311 2806
2312 $rmp->{random_seed} ||= $exit->random_seed; 2807 $rmp->{random_seed} ||= $exit->random_seed;
2313 2808
2314 my $data = cf::to_json $rmp; 2809 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2315 my $md5 = Digest::MD5::md5_hex $data; 2810 my $md5 = Digest::MD5::md5_hex $data;
2316 my $meta = "$RANDOMDIR/$md5.meta"; 2811 my $meta = "$RANDOMDIR/$md5.meta";
2317 2812
2318 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2813 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2319 aio_write $fh, 0, (length $data), $data, 0; 2814 aio_write $fh, 0, (length $data), $data, 0;
2320 undef $fh; 2815 undef $fh;
2321 aio_rename "$meta~", $meta; 2816 aio_rename "$meta~", $meta;
2322 2817
2818 my $slaying = "?random/$md5";
2819
2820 if ($exit->valid) {
2323 $exit->slaying ("?random/$md5"); 2821 $exit->slaying ("?random/$md5");
2324 $exit->msg (undef); 2822 $exit->msg (undef);
2823 }
2325 } 2824 }
2326} 2825}
2327 2826
2328sub cf::object::player::enter_exit { 2827sub cf::object::player::enter_exit {
2329 my ($self, $exit) = @_; 2828 my ($self, $exit) = @_;
2330 2829
2331 return unless $self->type == cf::PLAYER; 2830 return unless $self->type == cf::PLAYER;
2332 2831
2333 if ($exit->slaying eq "/!") {
2334 #TODO: this should de-fi-ni-te-ly not be a sync-job
2335 # the problem is that $exit might not survive long enough
2336 # so it needs to be done right now, right here
2337 cf::sync_job { prepare_random_map $exit };
2338 }
2339
2340 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2341 my $hp = $exit->stats->hp;
2342 my $sp = $exit->stats->sp;
2343
2344 $self->enter_link; 2832 $self->enter_link;
2345 2833
2346 (async { 2834 (async {
2347 $self->deactivate_recursive; # just to be sure 2835 $Coro::current->{desc} = "enter_exit";
2836
2348 unless (eval { 2837 unless (eval {
2838 $self->deactivate_recursive; # just to be sure
2839
2840 # random map handling
2841 {
2842 my $guard = cf::lock_acquire "exit_prepare:$exit";
2843
2844 prepare_random_map $exit
2845 if $exit->slaying eq "/!";
2846 }
2847
2848 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2849 my $x = $exit->stats->hp;
2850 my $y = $exit->stats->sp;
2851
2349 $self->goto ($slaying, $hp, $sp); 2852 $self->goto ($map, $x, $y);
2350 2853
2854 # if exit is damned, update players death & WoR home-position
2855 $self->contr->savebed ($map, $x, $y)
2856 if $exit->flag (cf::FLAG_DAMNED);
2857
2351 1; 2858 1
2352 }) { 2859 }) {
2353 $self->message ("Something went wrong deep within the crossfire server. " 2860 $self->message ("Something went wrong deep within the deliantra server. "
2354 . "I'll try to bring you back to the map you were before. " 2861 . "I'll try to bring you back to the map you were before. "
2355 . "Please report this to the dungeon master!", 2862 . "Please report this to the dungeon master!",
2356 cf::NDI_UNIQUE | cf::NDI_RED); 2863 cf::NDI_UNIQUE | cf::NDI_RED);
2357 2864
2358 warn "ERROR in enter_exit: $@"; 2865 error "ERROR in enter_exit: $@";
2359 $self->leave_link; 2866 $self->leave_link;
2360 } 2867 }
2361 })->prio (1); 2868 })->prio (1);
2362} 2869}
2363 2870
2377 2884
2378 utf8::encode $text; 2885 utf8::encode $text;
2379 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2886 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2380} 2887}
2381 2888
2889=item $client->send_big_packet ($pkt)
2890
2891Like C<send_packet>, but tries to compress large packets, and fragments
2892them as required.
2893
2894=cut
2895
2896our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2897
2898sub cf::client::send_big_packet {
2899 my ($self, $pkt) = @_;
2900
2901 # try lzf for large packets
2902 $pkt = "lzf " . Compress::LZF::compress $pkt
2903 if 1024 <= length $pkt and $self->{can_lzf};
2904
2905 # split very large packets
2906 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2907 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2908 $pkt = "frag";
2909 }
2910
2911 $self->send_packet ($pkt);
2912}
2913
2382=item $client->send_msg ($color, $type, $msg, [extra...]) 2914=item $client->send_msg ($channel, $msg, $color, [extra...])
2383 2915
2384Send a drawinfo or msg packet to the client, formatting the msg for the 2916Send a drawinfo or msg packet to the client, formatting the msg for the
2385client if neccessary. C<$type> should be a string identifying the type of 2917client if neccessary. C<$type> should be a string identifying the type of
2386the message, with C<log> being the default. If C<$color> is negative, suppress 2918the message, with C<log> being the default. If C<$color> is negative, suppress
2387the message unless the client supports the msg packet. 2919the message unless the client supports the msg packet.
2388 2920
2389=cut 2921=cut
2390 2922
2923# non-persistent channels (usually the info channel)
2924our %CHANNEL = (
2925 "c/motd" => {
2926 id => "infobox",
2927 title => "MOTD",
2928 reply => undef,
2929 tooltip => "The message of the day",
2930 },
2931 "c/identify" => {
2932 id => "infobox",
2933 title => "Identify",
2934 reply => undef,
2935 tooltip => "Items recently identified",
2936 },
2937 "c/examine" => {
2938 id => "infobox",
2939 title => "Examine",
2940 reply => undef,
2941 tooltip => "Signs and other items you examined",
2942 },
2943 "c/shopinfo" => {
2944 id => "infobox",
2945 title => "Shop Info",
2946 reply => undef,
2947 tooltip => "What your bargaining skill tells you about the shop",
2948 },
2949 "c/book" => {
2950 id => "infobox",
2951 title => "Book",
2952 reply => undef,
2953 tooltip => "The contents of a note or book",
2954 },
2955 "c/lookat" => {
2956 id => "infobox",
2957 title => "Look",
2958 reply => undef,
2959 tooltip => "What you saw there",
2960 },
2961 "c/who" => {
2962 id => "infobox",
2963 title => "Players",
2964 reply => undef,
2965 tooltip => "Shows players who are currently online",
2966 },
2967 "c/body" => {
2968 id => "infobox",
2969 title => "Body Parts",
2970 reply => undef,
2971 tooltip => "Shows which body parts you posess and are available",
2972 },
2973 "c/statistics" => {
2974 id => "infobox",
2975 title => "Statistics",
2976 reply => undef,
2977 tooltip => "Shows your primary statistics",
2978 },
2979 "c/skills" => {
2980 id => "infobox",
2981 title => "Skills",
2982 reply => undef,
2983 tooltip => "Shows your experience per skill and item power",
2984 },
2985 "c/shopitems" => {
2986 id => "infobox",
2987 title => "Shop Items",
2988 reply => undef,
2989 tooltip => "Shows the items currently for sale in this shop",
2990 },
2991 "c/resistances" => {
2992 id => "infobox",
2993 title => "Resistances",
2994 reply => undef,
2995 tooltip => "Shows your resistances",
2996 },
2997 "c/pets" => {
2998 id => "infobox",
2999 title => "Pets",
3000 reply => undef,
3001 tooltip => "Shows information abotu your pets/a specific pet",
3002 },
3003 "c/perceiveself" => {
3004 id => "infobox",
3005 title => "Perceive Self",
3006 reply => undef,
3007 tooltip => "You gained detailed knowledge about yourself",
3008 },
3009 "c/uptime" => {
3010 id => "infobox",
3011 title => "Uptime",
3012 reply => undef,
3013 tooltip => "How long the server has been running since last restart",
3014 },
3015 "c/mapinfo" => {
3016 id => "infobox",
3017 title => "Map Info",
3018 reply => undef,
3019 tooltip => "Information related to the maps",
3020 },
3021 "c/party" => {
3022 id => "party",
3023 title => "Party",
3024 reply => "gsay ",
3025 tooltip => "Messages and chat related to your party",
3026 },
3027 "c/death" => {
3028 id => "death",
3029 title => "Death",
3030 reply => undef,
3031 tooltip => "Reason for and more info about your most recent death",
3032 },
3033 "c/say" => $SAY_CHANNEL,
3034 "c/chat" => $CHAT_CHANNEL,
3035);
3036
2391sub cf::client::send_msg { 3037sub cf::client::send_msg {
2392 my ($self, $color, $type, $msg, @extra) = @_; 3038 my ($self, $channel, $msg, $color, @extra) = @_;
2393 3039
2394 $msg = $self->pl->expand_cfpod ($msg); 3040 $msg = $self->pl->expand_cfpod ($msg)
3041 unless $color & cf::NDI_VERBATIM;
2395 3042
2396 if ($self->can_msg) { 3043 $color &= cf::NDI_CLIENT_MASK; # just in case...
2397 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);
2398 } else {
2399 # replace some tags by gcfclient-compatible ones
2400 for ($msg) {
2401 1 while
2402 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2403 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2404 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2405 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2406 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2407 }
2408 3044
2409 if ($color >= 0) { 3045 # check predefined channels, for the benefit of C
2410 if (0 && $msg =~ /\[/) { 3046 if ($CHANNEL{$channel}) {
2411 $self->send_packet ("drawextinfo $color 4 0 $msg") 3047 $channel = $CHANNEL{$channel};
2412 } else { 3048
2413 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 3049 $self->ext_msg (channel_info => $channel);
2414 $self->send_packet ("drawinfo $color $msg") 3050 $channel = $channel->{id};
3051
3052 } elsif (ref $channel) {
3053 # send meta info to client, if not yet sent
3054 unless (exists $self->{channel}{$channel->{id}}) {
3055 $self->{channel}{$channel->{id}} = $channel;
3056 $self->ext_msg (channel_info => $channel);
2415 } 3057 }
2416 }
2417 }
2418}
2419 3058
3059 $channel = $channel->{id};
3060 }
3061
3062 return unless @extra || length $msg;
3063
3064 # default colour, mask it out
3065 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
3066 if $color & cf::NDI_DEF;
3067
3068 my $pkt = "msg "
3069 . $self->{json_coder}->encode (
3070 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
3071 );
3072
3073 $self->send_big_packet ($pkt);
3074}
3075
2420=item $client->ext_event ($type, %msg) 3076=item $client->ext_msg ($type, @msg)
2421 3077
2422Sends an ext event to the client. 3078Sends an ext event to the client.
2423 3079
2424=cut 3080=cut
2425 3081
2426sub cf::client::ext_event($$%) { 3082sub cf::client::ext_msg($$@) {
2427 my ($self, $type, %msg) = @_; 3083 my ($self, $type, @msg) = @_;
2428 3084
3085 if ($self->extcmd == 2) {
3086 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3087 } elsif ($self->extcmd == 1) { # TODO: remove
2429 $msg{msgtype} = "event_$type"; 3088 push @msg, msgtype => "event_$type";
2430 $self->send_packet ("ext " . cf::to_json \%msg); 3089 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3090 }
3091}
3092
3093=item $client->ext_reply ($msgid, @msg)
3094
3095Sends an ext reply to the client.
3096
3097=cut
3098
3099sub cf::client::ext_reply($$@) {
3100 my ($self, $id, @msg) = @_;
3101
3102 if ($self->extcmd == 2) {
3103 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3104 } elsif ($self->extcmd == 1) {
3105 #TODO: version 1, remove
3106 unshift @msg, msgtype => "reply", msgid => $id;
3107 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3108 }
2431} 3109}
2432 3110
2433=item $success = $client->query ($flags, "text", \&cb) 3111=item $success = $client->query ($flags, "text", \&cb)
2434 3112
2435Queues a query to the client, calling the given callback with 3113Queues a query to the client, calling the given callback with
2458 3136
2459 1 3137 1
2460} 3138}
2461 3139
2462cf::client->attach ( 3140cf::client->attach (
3141 on_connect => sub {
3142 my ($ns) = @_;
3143
3144 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
3145 },
2463 on_reply => sub { 3146 on_reply => sub {
2464 my ($ns, $msg) = @_; 3147 my ($ns, $msg) = @_;
2465 3148
2466 # this weird shuffling is so that direct followup queries 3149 # this weird shuffling is so that direct followup queries
2467 # get handled first 3150 # get handled first
2482 } 3165 }
2483 }, 3166 },
2484 on_exticmd => sub { 3167 on_exticmd => sub {
2485 my ($ns, $buf) = @_; 3168 my ($ns, $buf) = @_;
2486 3169
2487 my $msg = eval { from_json $buf }; 3170 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488 3171
2489 if (ref $msg) { 3172 if (ref $msg) {
3173 my ($type, $reply, @payload) =
3174 "ARRAY" eq ref $msg
3175 ? @$msg
3176 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3177
3178 my @reply;
3179
2490 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3180 if (my $cb = $EXTICMD{$type}) {
2491 if (my %reply = $cb->($ns, $msg)) { 3181 @reply = $cb->($ns, @payload);
2492 $reply{msgid} = $msg->{msgid};
2493 $ns->send ("ext " . cf::to_json \%reply);
2494 }
2495 } 3182 }
3183
3184 $ns->ext_reply ($reply, @reply)
3185 if $reply;
3186
2496 } else { 3187 } else {
2497 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3188 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2498 } 3189 }
2499 3190
2500 cf::override; 3191 cf::override;
2501 }, 3192 },
2502); 3193);
2522 3213
2523 $coro 3214 $coro
2524} 3215}
2525 3216
2526cf::client->attach ( 3217cf::client->attach (
2527 on_destroy => sub { 3218 on_client_destroy => sub {
2528 my ($ns) = @_; 3219 my ($ns) = @_;
2529 3220
2530 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3221 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2531 }, 3222 },
2532); 3223);
2547our $safe = new Safe "safe"; 3238our $safe = new Safe "safe";
2548our $safe_hole = new Safe::Hole; 3239our $safe_hole = new Safe::Hole;
2549 3240
2550$SIG{FPE} = 'IGNORE'; 3241$SIG{FPE} = 'IGNORE';
2551 3242
2552$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3243$safe->permit_only (Opcode::opset qw(
3244 :base_core :base_mem :base_orig :base_math :base_loop
3245 grepstart grepwhile mapstart mapwhile
3246 sort time
3247));
2553 3248
2554# here we export the classes and methods available to script code 3249# here we export the classes and methods available to script code
2555 3250
2556=pod 3251=pod
2557 3252
2558The following functions and methods are available within a safe environment: 3253The following functions and methods are available within a safe environment:
2559 3254
2560 cf::object contr pay_amount pay_player map 3255 cf::object
3256 contr pay_amount pay_player map x y force_find force_add destroy
3257 insert remove name archname title slaying race decrease split
3258 value
3259
2561 cf::object::player player 3260 cf::object::player
2562 cf::player peaceful 3261 player
2563 cf::map trigger 3262
3263 cf::player
3264 peaceful
3265
3266 cf::map
3267 trigger
2564 3268
2565=cut 3269=cut
2566 3270
2567for ( 3271for (
2568 ["cf::object" => qw(contr pay_amount pay_player map)], 3272 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3273 insert remove inv nrof name archname title slaying race
3274 decrease split destroy change_exp value msg lore send_msg)],
2569 ["cf::object::player" => qw(player)], 3275 ["cf::object::player" => qw(player)],
2570 ["cf::player" => qw(peaceful)], 3276 ["cf::player" => qw(peaceful send_msg)],
2571 ["cf::map" => qw(trigger)], 3277 ["cf::map" => qw(trigger)],
2572) { 3278) {
2573 no strict 'refs';
2574 my ($pkg, @funs) = @$_; 3279 my ($pkg, @funs) = @$_;
2575 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3280 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2576 for @funs; 3281 for @funs;
2577} 3282}
2578 3283
2593 3298
2594 my $qcode = $code; 3299 my $qcode = $code;
2595 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3300 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2596 $qcode =~ s/\n/\\n/g; 3301 $qcode =~ s/\n/\\n/g;
2597 3302
3303 %vars = (_dummy => 0) unless %vars;
3304
3305 my @res;
2598 local $_; 3306 local $_;
2599 local @safe::cf::_safe_eval_args = values %vars;
2600 3307
2601 my $eval = 3308 my $eval =
2602 "do {\n" 3309 "do {\n"
2603 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3310 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2604 . "#line 0 \"{$qcode}\"\n" 3311 . "#line 0 \"{$qcode}\"\n"
2605 . $code 3312 . $code
2606 . "\n}" 3313 . "\n}"
2607 ; 3314 ;
2608 3315
3316 if ($CFG{safe_eval}) {
2609 sub_generation_inc; 3317 sub_generation_inc;
3318 local @safe::cf::_safe_eval_args = values %vars;
2610 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3319 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2611 sub_generation_inc; 3320 sub_generation_inc;
3321 } else {
3322 local @cf::_safe_eval_args = values %vars;
3323 @res = wantarray ? eval eval : scalar eval $eval;
3324 }
2612 3325
2613 if ($@) { 3326 if ($@) {
2614 warn "$@"; 3327 warn "$@",
2615 warn "while executing safe code '$code'\n"; 3328 "while executing safe code '$code'\n",
2616 warn "with arguments " . (join " ", %vars) . "\n"; 3329 "with arguments " . (join " ", %vars) . "\n";
2617 } 3330 }
2618 3331
2619 wantarray ? @res : $res[0] 3332 wantarray ? @res : $res[0]
2620} 3333}
2621 3334
2635=cut 3348=cut
2636 3349
2637sub register_script_function { 3350sub register_script_function {
2638 my ($fun, $cb) = @_; 3351 my ($fun, $cb) = @_;
2639 3352
2640 no strict 'refs'; 3353 $fun = "safe::$fun" if $CFG{safe_eval};
2641 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3354 *$fun = $safe_hole->wrap ($cb);
2642} 3355}
2643 3356
2644=back 3357=back
2645 3358
2646=cut 3359=cut
2649# the server's init and main functions 3362# the server's init and main functions
2650 3363
2651sub load_facedata($) { 3364sub load_facedata($) {
2652 my ($path) = @_; 3365 my ($path) = @_;
2653 3366
3367 # HACK to clear player env face cache, we need some signal framework
3368 # for this (global event?)
3369 %ext::player_env::MUSIC_FACE_CACHE = ();
3370
3371 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3372
2654 warn "loading facedata from $path\n"; 3373 trace "loading facedata from $path\n";
2655 3374
2656 my $facedata; 3375 my $facedata;
2657 0 < aio_load $path, $facedata 3376 0 < aio_load $path, $facedata
2658 or die "$path: $!"; 3377 or die "$path: $!";
2659 3378
2660 $facedata = Coro::Storable::thaw $facedata; 3379 $facedata = Coro::Storable::thaw $facedata;
2661 3380
2662 $facedata->{version} == 2 3381 $facedata->{version} == 2
2663 or cf::cleanup "$path: version mismatch, cannot proceed."; 3382 or cf::cleanup "$path: version mismatch, cannot proceed.";
2664 3383
3384 # patch in the exptable
3385 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3386 $facedata->{resource}{"res/exp_table"} = {
3387 type => FT_RSRC,
3388 data => $exp_table,
3389 hash => (Digest::MD5::md5 $exp_table),
3390 };
3391 cf::cede_to_tick;
3392
2665 { 3393 {
2666 my $faces = $facedata->{faceinfo}; 3394 my $faces = $facedata->{faceinfo};
2667 3395
2668 while (my ($face, $info) = each %$faces) { 3396 while (my ($face, $info) = each %$faces) {
2669 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3397 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3398
2670 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3399 cf::face::set_visibility $idx, $info->{visibility};
3400 cf::face::set_magicmap $idx, $info->{magicmap};
2671 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2672 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3402 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2673 Coro::cede; 3403
3404 cf::cede_to_tick;
2674 } 3405 }
2675 3406
2676 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
2677 next unless $info->{smooth}; 3408 next unless $info->{smooth};
3409
2678 my $idx = cf::face::find $face 3410 my $idx = cf::face::find $face
2679 or next; 3411 or next;
3412
2680 if (my $smooth = cf::face::find $info->{smooth}) { 3413 if (my $smooth = cf::face::find $info->{smooth}) {
3414 cf::face::set_smooth $idx, $smooth;
2681 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3415 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682 } else { 3416 } else {
2683 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3417 error "smooth face '$info->{smooth}' not found for face '$face'";
2684 } 3418 }
2685 Coro::cede; 3419
3420 cf::cede_to_tick;
2686 } 3421 }
2687 } 3422 }
2688 3423
2689 { 3424 {
2690 my $anims = $facedata->{animinfo}; 3425 my $anims = $facedata->{animinfo};
2691 3426
2692 while (my ($anim, $info) = each %$anims) { 3427 while (my ($anim, $info) = each %$anims) {
2693 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3428 cf::anim::set $anim, $info->{frames}, $info->{facings};
2694 Coro::cede; 3429 cf::cede_to_tick;
2695 } 3430 }
2696 3431
2697 cf::anim::invalidate_all; # d'oh 3432 cf::anim::invalidate_all; # d'oh
2698 } 3433 }
2699 3434
3435 {
3436 my $res = $facedata->{resource};
3437
3438 while (my ($name, $info) = each %$res) {
3439 if (defined $info->{type}) {
3440 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3441
3442 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3443 cf::face::set_type $idx, $info->{type};
3444 } else {
3445 $RESOURCE{$name} = $info; # unused
3446 }
3447
3448 cf::cede_to_tick;
3449 }
3450 }
3451
3452 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3453
2700 1 3454 1
2701} 3455}
2702 3456
3457register_exticmd fx_want => sub {
3458 my ($ns, $want) = @_;
3459
3460 while (my ($k, $v) = each %$want) {
3461 $ns->fx_want ($k, $v);
3462 }
3463};
3464
3465sub load_resource_file($) {
3466 my $guard = lock_acquire "load_resource_file";
3467
3468 my $status = load_resource_file_ $_[0];
3469 get_slot 0.1, 100;
3470 cf::arch::commit_load;
3471
3472 $status
3473}
3474
2703sub reload_regions { 3475sub reload_regions {
3476 # HACK to clear player env face cache, we need some signal framework
3477 # for this (global event?)
3478 %ext::player_env::MUSIC_FACE_CACHE = ();
3479
2704 load_resource_file "$MAPDIR/regions" 3480 load_resource_file "$MAPDIR/regions"
2705 or die "unable to load regions file\n"; 3481 or die "unable to load regions file\n";
3482
3483 for (cf::region::list) {
3484 $_->{match} = qr/$_->{match}/
3485 if exists $_->{match};
3486 }
2706} 3487}
2707 3488
2708sub reload_facedata { 3489sub reload_facedata {
2709 load_facedata "$DATADIR/facedata" 3490 load_facedata "$DATADIR/facedata"
2710 or die "unable to load facedata\n"; 3491 or die "unable to load facedata\n";
2718sub reload_treasures { 3499sub reload_treasures {
2719 load_resource_file "$DATADIR/treasures" 3500 load_resource_file "$DATADIR/treasures"
2720 or die "unable to load treasurelists\n"; 3501 or die "unable to load treasurelists\n";
2721} 3502}
2722 3503
3504sub reload_sound {
3505 trace "loading sound config from $DATADIR/sound\n";
3506
3507 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3508 or die "$DATADIR/sound $!";
3509
3510 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3511
3512 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3513 my $sound = $soundconf->{compat}[$_]
3514 or next;
3515
3516 my $face = cf::face::find "sound/$sound->[1]";
3517 cf::sound::set $sound->[0] => $face;
3518 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3519 }
3520
3521 while (my ($k, $v) = each %{$soundconf->{event}}) {
3522 my $face = cf::face::find "sound/$v";
3523 cf::sound::set $k => $face;
3524 }
3525}
3526
2723sub reload_resources { 3527sub reload_resources {
2724 warn "reloading resource files...\n"; 3528 trace "reloading resource files...\n";
2725 3529
3530 reload_exp_table;
3531 reload_materials;
3532 reload_facedata;
3533 reload_sound;
3534 reload_archetypes;
2726 reload_regions; 3535 reload_regions;
2727 reload_facedata;
2728 #reload_archetypes;#d#
2729 reload_archetypes;
2730 reload_treasures; 3536 reload_treasures;
2731 3537
2732 warn "finished reloading resource files\n"; 3538 trace "finished reloading resource files\n";
2733} 3539}
2734 3540
2735sub init { 3541sub reload_config {
2736 reload_resources; 3542 trace "reloading config file...\n";
2737}
2738 3543
2739sub cfg_load {
2740 open my $fh, "<:utf8", "$CONFDIR/config" 3544 open my $fh, "<:utf8", "$CONFDIR/config"
2741 or return; 3545 or return;
2742 3546
2743 local $/; 3547 local $/;
2744 *CFG = YAML::Syck::Load <$fh>; 3548 *CFG = YAML::XS::Load scalar <$fh>;
2745 3549
2746 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3550 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2747 3551
2748 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3552 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2749 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3553 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2750 3554
2751 if (exists $CFG{mlockall}) { 3555 if (exists $CFG{mlockall}) {
2753 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3557 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2754 and die "WARNING: m(un)lockall failed: $!\n"; 3558 and die "WARNING: m(un)lockall failed: $!\n";
2755 }; 3559 };
2756 warn $@ if $@; 3560 warn $@ if $@;
2757 } 3561 }
3562
3563 trace "finished reloading resource files\n";
3564}
3565
3566sub pidfile() {
3567 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3568 or die "$PIDFILE: $!";
3569 flock $fh, &Fcntl::LOCK_EX
3570 or die "$PIDFILE: flock: $!";
3571 $fh
3572}
3573
3574# make sure only one server instance is running at any one time
3575sub atomic {
3576 my $fh = pidfile;
3577
3578 my $pid = <$fh>;
3579 kill 9, $pid if $pid > 0;
3580
3581 seek $fh, 0, 0;
3582 print $fh $$;
3583}
3584
3585sub main_loop {
3586 trace "EV::loop starting\n";
3587 if (1) {
3588 EV::loop;
3589 }
3590 trace "EV::loop returned\n";
3591 goto &main_loop unless $REALLY_UNLOOP;
2758} 3592}
2759 3593
2760sub main { 3594sub main {
3595 cf::init_globals; # initialise logging
3596
3597 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3598 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3599 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3600 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3601
3602 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3603
2761 # we must not ever block the main coroutine 3604 # we must not ever block the main coroutine
2762 local $Coro::idle = sub { 3605 local $Coro::idle = sub {
2763 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3606 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2764 (async { 3607 (async {
2765 Event::one_event; 3608 $Coro::current->{desc} = "IDLE BUG HANDLER";
3609 EV::loop EV::LOOP_ONESHOT;
2766 })->prio (Coro::PRIO_MAX); 3610 })->prio (Coro::PRIO_MAX);
2767 }; 3611 };
2768 3612
2769 cfg_load; 3613 evthread_start IO::AIO::poll_fileno;
3614
3615 cf::sync_job {
3616 cf::incloader::init ();
3617
3618 cf::init_anim;
3619 cf::init_attackmess;
3620 cf::init_dynamic;
3621
3622 cf::load_settings;
3623
3624 reload_resources;
3625 reload_config;
2770 db_init; 3626 db_init;
3627
3628 cf::init_uuid;
3629 cf::init_signals;
3630 cf::init_skills;
3631
3632 cf::init_beforeplay;
3633
3634 atomic;
3635
2771 load_extensions; 3636 load_extensions;
2772 3637
2773 $TICK_WATCHER->start; 3638 utime time, time, $RUNTIMEFILE;
2774 Event::loop; 3639
3640 # no (long-running) fork's whatsoever before this point(!)
3641 use POSIX ();
3642 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3643
3644 (pop @POST_INIT)->(0) while @POST_INIT;
3645 };
3646
3647 cf::object::thawer::errors_are_fatal 0;
3648 info "parse errors in files are no longer fatal from this point on.\n";
3649
3650 my $free_main; $free_main = EV::idle sub {
3651 undef $free_main;
3652 undef &main; # free gobs of memory :)
3653 };
3654
3655 goto &main_loop;
2775} 3656}
2776 3657
2777############################################################################# 3658#############################################################################
2778# initialisation and cleanup 3659# initialisation and cleanup
2779 3660
2780# install some emergency cleanup handlers 3661# install some emergency cleanup handlers
2781BEGIN { 3662BEGIN {
3663 our %SIGWATCHER = ();
2782 for my $signal (qw(INT HUP TERM)) { 3664 for my $signal (qw(INT HUP TERM)) {
2783 Event->signal ( 3665 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2784 reentrant => 0,
2785 data => WF_AUTOCANCEL,
2786 signal => $signal,
2787 prio => 0,
2788 cb => sub {
2789 cf::cleanup "SIG$signal"; 3666 cf::cleanup "SIG$signal";
2790 },
2791 ); 3667 };
2792 } 3668 }
2793} 3669}
2794 3670
2795sub write_runtime { 3671sub write_runtime_sync {
2796 my $runtime = "$LOCALDIR/runtime"; 3672 my $t0 = AE::time;
2797 3673
2798 # first touch the runtime file to show we are still running: 3674 # first touch the runtime file to show we are still running:
2799 # the fsync below can take a very very long time. 3675 # the fsync below can take a very very long time.
2800 3676
2801 IO::AIO::aio_utime $runtime, undef, undef; 3677 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2802 3678
2803 my $guard = cf::lock_acquire "write_runtime"; 3679 my $guard = cf::lock_acquire "write_runtime";
2804 3680
2805 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3681 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
2806 or return; 3682 or return;
2807 3683
2808 my $value = $cf::RUNTIME + 90 + 10; 3684 my $value = $cf::RUNTIME + 90 + 10;
2809 # 10 is the runtime save interval, for a monotonic clock 3685 # 10 is the runtime save interval, for a monotonic clock
2810 # 60 allows for the watchdog to kill the server. 3686 # 60 allows for the watchdog to kill the server.
2820 aio_utime $fh, undef, undef; 3696 aio_utime $fh, undef, undef;
2821 3697
2822 close $fh 3698 close $fh
2823 or return; 3699 or return;
2824 3700
2825 aio_rename "$runtime~", $runtime 3701 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2826 and return; 3702 and return;
2827 3703
2828 warn "runtime file written.\n"; 3704 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
2829 3705
2830 1 3706 1
3707}
3708
3709our $uuid_lock;
3710our $uuid_skip;
3711
3712sub write_uuid_sync($) {
3713 $uuid_skip ||= $_[0];
3714
3715 return if $uuid_lock;
3716 local $uuid_lock = 1;
3717
3718 my $uuid = "$LOCALDIR/uuid";
3719
3720 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3721 or return;
3722
3723 my $value = uuid_seq uuid_cur;
3724
3725 unless ($value) {
3726 info "cowardly refusing to write zero uuid value!\n";
3727 return;
3728 }
3729
3730 my $value = uuid_str $value + $uuid_skip;
3731 $uuid_skip = 0;
3732
3733 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3734 and return;
3735
3736 # always fsync - this file is important
3737 aio_fsync $fh
3738 and return;
3739
3740 close $fh
3741 or return;
3742
3743 aio_rename "$uuid~", $uuid
3744 and return;
3745
3746 trace "uuid file written ($value).\n";
3747
3748 1
3749
3750}
3751
3752sub write_uuid($$) {
3753 my ($skip, $sync) = @_;
3754
3755 $sync ? write_uuid_sync $skip
3756 : async { write_uuid_sync $skip };
2831} 3757}
2832 3758
2833sub emergency_save() { 3759sub emergency_save() {
2834 my $freeze_guard = cf::freeze_mainloop; 3760 my $freeze_guard = cf::freeze_mainloop;
2835 3761
2836 warn "enter emergency perl save\n"; 3762 info "emergency_perl_save: enter\n";
3763
3764 # this is a trade-off: we want to be very quick here, so
3765 # save all maps without fsync, and later call a global sync
3766 # (which in turn might be very very slow)
3767 local $USE_FSYNC = 0;
2837 3768
2838 cf::sync_job { 3769 cf::sync_job {
3770 cf::write_runtime_sync; # external watchdog should not bark
3771
2839 # use a peculiar iteration method to avoid tripping on perl 3772 # use a peculiar iteration method to avoid tripping on perl
2840 # refcount bugs in for. also avoids problems with players 3773 # refcount bugs in for. also avoids problems with players
2841 # and maps saved/destroyed asynchronously. 3774 # and maps saved/destroyed asynchronously.
2842 warn "begin emergency player save\n"; 3775 info "emergency_perl_save: begin player save\n";
2843 for my $login (keys %cf::PLAYER) { 3776 for my $login (keys %cf::PLAYER) {
2844 my $pl = $cf::PLAYER{$login} or next; 3777 my $pl = $cf::PLAYER{$login} or next;
2845 $pl->valid or next; 3778 $pl->valid or next;
3779 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2846 $pl->save; 3780 $pl->save;
2847 } 3781 }
2848 warn "end emergency player save\n"; 3782 info "emergency_perl_save: end player save\n";
2849 3783
2850 warn "begin emergency map save\n"; 3784 cf::write_runtime_sync; # external watchdog should not bark
3785
3786 info "emergency_perl_save: begin map save\n";
2851 for my $path (keys %cf::MAP) { 3787 for my $path (keys %cf::MAP) {
2852 my $map = $cf::MAP{$path} or next; 3788 my $map = $cf::MAP{$path} or next;
2853 $map->valid or next; 3789 $map->valid or next;
2854 $map->save; 3790 $map->save;
2855 } 3791 }
2856 warn "end emergency map save\n"; 3792 info "emergency_perl_save: end map save\n";
2857 3793
2858 warn "begin emergency database checkpoint\n"; 3794 cf::write_runtime_sync; # external watchdog should not bark
3795
3796 info "emergency_perl_save: begin database checkpoint\n";
2859 BDB::db_env_txn_checkpoint $DB_ENV; 3797 BDB::db_env_txn_checkpoint $DB_ENV;
2860 warn "end emergency database checkpoint\n"; 3798 info "emergency_perl_save: end database checkpoint\n";
3799
3800 info "emergency_perl_save: begin write uuid\n";
3801 write_uuid_sync 1;
3802 info "emergency_perl_save: end write uuid\n";
3803
3804 cf::write_runtime_sync; # external watchdog should not bark
3805
3806 trace "emergency_perl_save: syncing database to disk";
3807 BDB::db_env_txn_checkpoint $DB_ENV;
3808
3809 info "emergency_perl_save: starting sync\n";
3810 IO::AIO::aio_sync sub {
3811 info "emergency_perl_save: finished sync\n";
3812 };
3813
3814 cf::write_runtime_sync; # external watchdog should not bark
3815
3816 trace "emergency_perl_save: flushing outstanding aio requests";
3817 while (IO::AIO::nreqs || BDB::nreqs) {
3818 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3819 }
3820
3821 cf::write_runtime_sync; # external watchdog should not bark
2861 }; 3822 };
2862 3823
2863 warn "leave emergency perl save\n"; 3824 info "emergency_perl_save: leave\n";
2864} 3825}
2865 3826
2866sub post_cleanup { 3827sub post_cleanup {
2867 my ($make_core) = @_; 3828 my ($make_core) = @_;
2868 3829
3830 IO::AIO::flush;
3831
2869 warn Carp::longmess "post_cleanup backtrace" 3832 error Carp::longmess "post_cleanup backtrace"
2870 if $make_core; 3833 if $make_core;
3834
3835 my $fh = pidfile;
3836 unlink $PIDFILE if <$fh> == $$;
3837}
3838
3839# a safer delete_package, copied from Symbol
3840sub clear_package($) {
3841 my $pkg = shift;
3842
3843 # expand to full symbol table name if needed
3844 unless ($pkg =~ /^main::.*::$/) {
3845 $pkg = "main$pkg" if $pkg =~ /^::/;
3846 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3847 $pkg .= '::' unless $pkg =~ /::$/;
3848 }
3849
3850 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3851 my $stem_symtab = *{$stem}{HASH};
3852
3853 defined $stem_symtab and exists $stem_symtab->{$leaf}
3854 or return;
3855
3856 # clear all symbols
3857 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3858 for my $name (keys %$leaf_symtab) {
3859 _gv_clear *{"$pkg$name"};
3860# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3861 }
2871} 3862}
2872 3863
2873sub do_reload_perl() { 3864sub do_reload_perl() {
2874 # can/must only be called in main 3865 # can/must only be called in main
2875 if ($Coro::current != $Coro::main) { 3866 unless (in_main) {
2876 warn "can only reload from main coroutine"; 3867 error "can only reload from main coroutine";
2877 return; 3868 return;
2878 } 3869 }
2879 3870
3871 return if $RELOAD++;
3872
3873 my $t1 = AE::time;
3874
3875 while ($RELOAD) {
3876 cf::get_slot 0.1, -1, "reload_perl";
2880 warn "reloading..."; 3877 info "reloading...";
2881 3878
2882 warn "entering sync_job"; 3879 trace "entering sync_job";
2883 3880
2884 cf::sync_job { 3881 cf::sync_job {
2885 cf::write_runtime; # external watchdog should not bark
2886 cf::emergency_save; 3882 #cf::emergency_save;
2887 cf::write_runtime; # external watchdog should not bark
2888 3883
2889 warn "syncing database to disk";
2890 BDB::db_env_txn_checkpoint $DB_ENV;
2891
2892 # if anything goes wrong in here, we should simply crash as we already saved
2893
2894 warn "cancelling all WF_AUTOCANCEL watchers";
2895 for (Event::all_watchers) {
2896 $_->cancel if $_->data & WF_AUTOCANCEL;
2897 }
2898
2899 warn "flushing outstanding aio requests";
2900 for (;;) {
2901 BDB::flush;
2902 IO::AIO::flush;
2903 Coro::cede;
2904 last unless IO::AIO::nreqs || BDB::nreqs;
2905 warn "iterate...";
2906 }
2907
2908 ++$RELOAD;
2909
2910 warn "cancelling all extension coros"; 3884 trace "cancelling all extension coros";
2911 $_->cancel for values %EXT_CORO; 3885 $_->cancel for values %EXT_CORO;
2912 %EXT_CORO = (); 3886 %EXT_CORO = ();
2913 3887
2914 warn "removing commands"; 3888 trace "removing commands";
2915 %COMMAND = (); 3889 %COMMAND = ();
2916 3890
2917 warn "removing ext/exti commands"; 3891 trace "removing ext/exti commands";
2918 %EXTCMD = (); 3892 %EXTCMD = ();
2919 %EXTICMD = (); 3893 %EXTICMD = ();
2920 3894
2921 warn "unloading/nuking all extensions"; 3895 trace "unloading/nuking all extensions";
2922 for my $pkg (@EXTS) { 3896 for my $pkg (@EXTS) {
2923 warn "... unloading $pkg"; 3897 trace "... unloading $pkg";
2924 3898
2925 if (my $cb = $pkg->can ("unload")) { 3899 if (my $cb = $pkg->can ("unload")) {
2926 eval { 3900 eval {
2927 $cb->($pkg); 3901 $cb->($pkg);
2928 1 3902 1
2929 } or warn "$pkg unloaded, but with errors: $@"; 3903 } or error "$pkg unloaded, but with errors: $@";
3904 }
3905
3906 trace "... clearing $pkg";
3907 clear_package $pkg;
2930 } 3908 }
2931 3909
2932 warn "... nuking $pkg";
2933 Symbol::delete_package $pkg;
2934 }
2935
2936 warn "unloading all perl modules loaded from $LIBDIR"; 3910 trace "unloading all perl modules loaded from $LIBDIR";
2937 while (my ($k, $v) = each %INC) { 3911 while (my ($k, $v) = each %INC) {
2938 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3912 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2939 3913
2940 warn "... unloading $k"; 3914 trace "... unloading $k";
2941 delete $INC{$k}; 3915 delete $INC{$k};
2942 3916
2943 $k =~ s/\.pm$//; 3917 $k =~ s/\.pm$//;
2944 $k =~ s/\//::/g; 3918 $k =~ s/\//::/g;
2945 3919
2946 if (my $cb = $k->can ("unload_module")) { 3920 if (my $cb = $k->can ("unload_module")) {
2947 $cb->(); 3921 $cb->();
3922 }
3923
3924 clear_package $k;
2948 } 3925 }
2949 3926
2950 Symbol::delete_package $k;
2951 }
2952
2953 warn "getting rid of safe::, as good as possible"; 3927 trace "getting rid of safe::, as good as possible";
2954 Symbol::delete_package "safe::$_" 3928 clear_package "safe::$_"
2955 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3929 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2956 3930
2957 warn "unloading cf.pm \"a bit\""; 3931 trace "unloading cf.pm \"a bit\"";
2958 delete $INC{"cf.pm"}; 3932 delete $INC{"cf.pm"};
2959 delete $INC{"cf/pod.pm"}; 3933 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2960 3934
2961 # don't, removes xs symbols, too, 3935 # don't, removes xs symbols, too,
2962 # and global variables created in xs 3936 # and global variables created in xs
2963 #Symbol::delete_package __PACKAGE__; 3937 #clear_package __PACKAGE__;
2964 3938
2965 warn "unload completed, starting to reload now"; 3939 info "unload completed, starting to reload now";
2966 3940
2967 warn "reloading cf.pm"; 3941 trace "reloading cf.pm";
2968 require cf; 3942 require cf;
2969 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3943 cf::_connect_to_perl_1;
2970 3944
2971 warn "loading config and database again"; 3945 trace "loading config and database again";
2972 cf::cfg_load; 3946 cf::reload_config;
2973 3947
2974 warn "loading extensions"; 3948 trace "loading extensions";
2975 cf::load_extensions; 3949 cf::load_extensions;
2976 3950
3951 if ($REATTACH_ON_RELOAD) {
2977 warn "reattaching attachments to objects/players"; 3952 trace "reattaching attachments to objects/players";
2978 _global_reattach; # objects, sockets 3953 _global_reattach; # objects, sockets
2979 warn "reattaching attachments to maps"; 3954 trace "reattaching attachments to maps";
2980 reattach $_ for values %MAP; 3955 reattach $_ for values %MAP;
2981 warn "reattaching attachments to players"; 3956 trace "reattaching attachments to players";
2982 reattach $_ for values %PLAYER; 3957 reattach $_ for values %PLAYER;
3958 }
2983 3959
3960 trace "running post_init jobs";
3961 (pop @POST_INIT)->(1) while @POST_INIT;
3962
2984 warn "leaving sync_job"; 3963 trace "leaving sync_job";
2985 3964
2986 1 3965 1
2987 } or do { 3966 } or do {
2988 warn $@; 3967 error $@;
2989 warn "error while reloading, exiting."; 3968 cf::cleanup "error while reloading, exiting.";
2990 exit 1; 3969 };
3970
3971 info "reloaded";
3972 --$RELOAD;
2991 }; 3973 }
2992 3974
2993 warn "reloaded"; 3975 $t1 = AE::time - $t1;
3976 info "reload completed in ${t1}s\n";
2994}; 3977};
2995 3978
2996our $RELOAD_WATCHER; # used only during reload 3979our $RELOAD_WATCHER; # used only during reload
2997 3980
2998sub reload_perl() { 3981sub reload_perl() {
2999 # doing reload synchronously and two reloads happen back-to-back, 3982 # doing reload synchronously and two reloads happen back-to-back,
3000 # coro crashes during coro_state_free->destroy here. 3983 # coro crashes during coro_state_free->destroy here.
3001 3984
3002 $RELOAD_WATCHER ||= Event->timer ( 3985 $RELOAD_WATCHER ||= cf::async {
3003 reentrant => 0, 3986 Coro::AIO::aio_wait cache_extensions;
3004 after => 0, 3987
3005 data => WF_AUTOCANCEL, 3988 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3006 cb => sub {
3007 do_reload_perl; 3989 do_reload_perl;
3008 undef $RELOAD_WATCHER; 3990 undef $RELOAD_WATCHER;
3009 }, 3991 };
3010 ); 3992 };
3011} 3993}
3012 3994
3013register_command "reload" => sub { 3995register_command "reload" => sub {
3014 my ($who, $arg) = @_; 3996 my ($who, $arg) = @_;
3015 3997
3016 if ($who->flag (FLAG_WIZ)) { 3998 if ($who->flag (FLAG_WIZ)) {
3017 $who->message ("reloading server."); 3999 $who->message ("reloading server.");
4000 async {
4001 $Coro::current->{desc} = "perl_reload";
3018 async { reload_perl }; 4002 reload_perl;
4003 };
3019 } 4004 }
3020}; 4005};
3021 4006
3022unshift @INC, $LIBDIR; 4007#############################################################################
3023 4008
3024my $bug_warning = 0; 4009my $bug_warning = 0;
3025 4010
3026our @WAIT_FOR_TICK; 4011our @WAIT_FOR_TICK;
3027our @WAIT_FOR_TICK_BEGIN; 4012our @WAIT_FOR_TICK_BEGIN;
3028 4013
3029sub wait_for_tick { 4014sub wait_for_tick {
3030 return unless $TICK_WATCHER->is_active;
3031 return if $Coro::current == $Coro::main; 4015 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3032 4016
3033 my $signal = new Coro::Signal; 4017 my $signal = new Coro::Signal;
3034 push @WAIT_FOR_TICK, $signal; 4018 push @WAIT_FOR_TICK, $signal;
3035 $signal->wait; 4019 $signal->wait;
3036} 4020}
3037 4021
3038sub wait_for_tick_begin { 4022sub wait_for_tick_begin {
3039 return unless $TICK_WATCHER->is_active;
3040 return if $Coro::current == $Coro::main; 4023 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3041 4024
3042 my $signal = new Coro::Signal; 4025 my $signal = new Coro::Signal;
3043 push @WAIT_FOR_TICK_BEGIN, $signal; 4026 push @WAIT_FOR_TICK_BEGIN, $signal;
3044 $signal->wait; 4027 $signal->wait;
3045} 4028}
3046 4029
3047 my $min = 1e6;#d# 4030sub tick {
3048 my $avg = 10;
3049$TICK_WATCHER = Event->timer (
3050 reentrant => 0,
3051 parked => 1,
3052 prio => 0,
3053 at => $NEXT_TICK || $TICK,
3054 data => WF_AUTOCANCEL,
3055 cb => sub {
3056 if ($Coro::current != $Coro::main) { 4031 if ($Coro::current != $Coro::main) {
3057 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4032 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3058 unless ++$bug_warning > 10; 4033 unless ++$bug_warning > 10;
3059 return; 4034 return;
3060 } 4035 }
3061 4036
3062 $NOW = $tick_start = Event::time;
3063
3064 cf::server_tick; # one server iteration 4037 cf::server_tick; # one server iteration
3065 4038
3066 0 && sync_job {#d# 4039 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3067 for(1..10) {
3068 my $t = Event::time;
3069 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3070 or die;
3071 4040
3072 $map->width (50); 4041 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3073 $map->height (50); 4042 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3074 $map->alloc; 4043 Coro::async_pool {
3075 $map->_load_objects ("/tmp/x.map", 1); 4044 $Coro::current->{desc} = "runtime saver";
3076 my $t = Event::time - $t; 4045 write_runtime_sync
3077 4046 or error "ERROR: unable to write runtime file: $!";
3078 #next unless $t < 0.0013;#d#
3079 if ($t < $min) {
3080 $min = $t;
3081 }
3082 $avg = $avg * 0.99 + $t * 0.01;
3083 }
3084 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3085 exit 0;
3086 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3087 }; 4047 };
4048 }
3088 4049
3089 $RUNTIME += $TICK;
3090 $NEXT_TICK += $TICK;
3091
3092 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3093 $NEXT_RUNTIME_WRITE = $NOW + 10;
3094 Coro::async_pool {
3095 write_runtime
3096 or warn "ERROR: unable to write runtime file: $!";
3097 };
3098 }
3099
3100# my $AFTER = Event::time;
3101# warn $AFTER - $NOW;#d#
3102
3103 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4050 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3104 $sig->send; 4051 $sig->send;
3105 } 4052 }
3106 while (my $sig = shift @WAIT_FOR_TICK) { 4053 while (my $sig = shift @WAIT_FOR_TICK) {
3107 $sig->send; 4054 $sig->send;
3108 } 4055 }
3109 4056
3110 $NOW = Event::time; 4057 $LOAD = ($NOW - $TICK_START) / $TICK;
3111
3112 # if we are delayed by four ticks or more, skip them all
3113 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3114
3115 $TICK_WATCHER->at ($NEXT_TICK);
3116 $TICK_WATCHER->start;
3117
3118 $LOAD = ($NOW - $tick_start) / $TICK;
3119 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4058 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3120 4059
3121 _post_tick; 4060 if (0) {
3122 4061 if ($NEXT_TICK) {
3123 4062 my $jitter = $TICK_START - $NEXT_TICK;
4063 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4064 debug "jitter $JITTER\n";#d#
4065 }
3124 }, 4066 }
3125); 4067}
3126 4068
3127{ 4069{
3128 BDB::max_poll_time $TICK * 0.1; 4070 # configure BDB
3129 $BDB_POLL_WATCHER = Event->io ( 4071
3130 reentrant => 0,
3131 fd => BDB::poll_fileno,
3132 poll => 'r',
3133 prio => 0,
3134 data => WF_AUTOCANCEL,
3135 cb => \&BDB::poll_cb,
3136 );
3137 BDB::min_parallel 8; 4072 BDB::min_parallel 16;
3138 4073 BDB::max_poll_reqs $TICK * 0.1;
3139 BDB::set_sync_prepare { 4074 $AnyEvent::BDB::WATCHER->priority (1);
3140 my $status;
3141 my $current = $Coro::current;
3142 (
3143 sub {
3144 $status = $!;
3145 $current->ready; undef $current;
3146 },
3147 sub {
3148 Coro::schedule while defined $current;
3149 $! = $status;
3150 },
3151 )
3152 };
3153 4075
3154 unless ($DB_ENV) { 4076 unless ($DB_ENV) {
3155 $DB_ENV = BDB::db_env_create; 4077 $DB_ENV = BDB::db_env_create;
4078 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4079 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4080 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4081 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4082 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3156 4083
3157 cf::sync_job { 4084 cf::sync_job {
3158 eval { 4085 eval {
3159 BDB::db_env_open 4086 BDB::db_env_open
3160 $DB_ENV, 4087 $DB_ENV,
3162 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4089 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3163 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4090 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3164 0666; 4091 0666;
3165 4092
3166 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4093 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3167
3168 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3169 $DB_ENV->set_lk_detect;
3170 }; 4094 };
3171 4095
3172 cf::cleanup "db_env_open(db): $@" if $@; 4096 cf::cleanup "db_env_open(db): $@" if $@;
3173 }; 4097 };
3174 } 4098 }
4099
4100 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4101 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4102 };
4103 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4104 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4105 };
4106 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4107 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4108 };
3175} 4109}
3176 4110
3177{ 4111{
4112 # configure IO::AIO
4113
3178 IO::AIO::min_parallel 8; 4114 IO::AIO::min_parallel 8;
3179
3180 undef $Coro::AIO::WATCHER;
3181 IO::AIO::max_poll_time $TICK * 0.1; 4115 IO::AIO::max_poll_time $TICK * 0.1;
3182 $AIO_POLL_WATCHER = Event->io ( 4116 undef $AnyEvent::AIO::WATCHER;
3183 reentrant => 0,
3184 data => WF_AUTOCANCEL,
3185 fd => IO::AIO::poll_fileno,
3186 poll => 'r',
3187 prio => 6,
3188 cb => \&IO::AIO::poll_cb,
3189 );
3190} 4117}
3191 4118
3192my $_log_backtrace; 4119my $_log_backtrace;
3193 4120
3194sub _log_backtrace { 4121sub _log_backtrace {
3197 $msg =~ s/\n//; 4124 $msg =~ s/\n//;
3198 4125
3199 # limit the # of concurrent backtraces 4126 # limit the # of concurrent backtraces
3200 if ($_log_backtrace < 2) { 4127 if ($_log_backtrace < 2) {
3201 ++$_log_backtrace; 4128 ++$_log_backtrace;
4129 my $perl_bt = Carp::longmess $msg;
3202 async { 4130 async {
4131 $Coro::current->{desc} = "abt $msg";
4132
3203 my @bt = fork_call { 4133 my @bt = fork_call {
3204 @addr = map { sprintf "%x", $_ } @addr; 4134 @addr = map { sprintf "%x", $_ } @addr;
3205 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4135 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3206 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4136 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3207 or die "addr2line: $!"; 4137 or die "addr2line: $!";
3215 } 4145 }
3216 4146
3217 @funcs 4147 @funcs
3218 }; 4148 };
3219 4149
3220 LOG llevInfo, "[ABT] $msg\n"; 4150 LOG llevInfo, "[ABT] $perl_bt\n";
4151 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3221 LOG llevInfo, "[ABT] $_\n" for @bt; 4152 LOG llevInfo, "[ABT] $_\n" for @bt;
3222 --$_log_backtrace; 4153 --$_log_backtrace;
3223 }; 4154 };
3224 } else { 4155 } else {
3225 LOG llevInfo, "[ABT] $msg\n"; 4156 LOG llevInfo, "[ABT] $msg\n";
3226 LOG llevInfo, "[ABT] [suppressed]\n"; 4157 LOG llevInfo, "[ABT] [suppressed]\n";
3227 } 4158 }
3228} 4159}
3229 4160
3230# load additional modules 4161# load additional modules
3231use cf::pod; 4162require "cf/$_.pm" for @EXTRA_MODULES;
4163cf::_connect_to_perl_2;
3232 4164
3233END { cf::emergency_save } 4165END { cf::emergency_save }
3234 4166
32351 41671
3236 4168

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines