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.313 by root, Sun Jul 22 14:17:58 2007 UTC vs.
Revision 1.457 by root, Wed Oct 1 05:50:19 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your 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 GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.61 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
49use Coro::Util ();
24 50
25use JSON::XS 1.4 (); 51use JSON::XS 2.01 ();
26use BDB (); 52use BDB ();
27use Data::Dumper; 53use Data::Dumper;
28use Digest::MD5; 54use Digest::MD5;
29use Fcntl; 55use Fcntl;
30use YAML::Syck (); 56use YAML ();
31use IO::AIO 2.32 (); 57use IO::AIO ();
32use Time::HiRes; 58use Time::HiRes;
33use Compress::LZF; 59use Compress::LZF;
34use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
35 63
36# configure various modules to our taste 64# configure various modules to our taste
37# 65#
38$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41
42$Event::Eval = 1; # no idea why this is required, but it is
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 74
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 76
51our %COMMAND = (); 77our %COMMAND = ();
52our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
55our %EXTCMD = (); 81our %EXTCMD = ();
56our %EXTICMD = (); 82our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
59 85
60our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 87our @EVENT;
62 88
63our $CONFDIR = confdir; 89our $CONFDIR = confdir;
64our $DATADIR = datadir; 90our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
103our %RESOURCE;
74 104
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 107our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
82 109
110our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 112our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 113our $DB_ENV;
85 114
86our %CFG; 115our %CFG;
87 116
88our $UPTIME; $UPTIME ||= time; 117our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 118our $RUNTIME;
119our $NOW;
90 120
91our %PLAYER; # all users 121our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 122our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 123our $LINK_MAP; # the special {link} map, which is always available
94 124
95# used to convert map paths into valid unix filenames by replacing / by ∕ 125# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 126our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 127
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
132
133our @POST_INIT;
134
135our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
101 136
102binmode STDOUT; 137binmode STDOUT;
103binmode STDERR; 138binmode STDERR;
104 139
105# read virtual server time, if available 140# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 141unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 142 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 143 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 144 $RUNTIME = <$fh> + 0.;
110} 145}
111 146
112mkdir $_ 147mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 148 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
158 193
159The raw value load value from the last tick. 194The raw value load value from the last tick.
160 195
161=item %cf::CFG 196=item %cf::CFG
162 197
163Configuration for the server, loaded from C</etc/crossfire/config>, or 198Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 199from wherever your confdir points to.
165 200
166=item cf::wait_for_tick, cf::wait_for_tick_begin 201=item cf::wait_for_tick, cf::wait_for_tick_begin
167 202
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 203These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
186 $msg .= "\n" 221 $msg .= "\n"
187 unless $msg =~ /\n$/; 222 unless $msg =~ /\n$/;
188 223
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 224 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 225
191 utf8::encode $msg;
192 LOG llevError, $msg; 226 LOG llevError, $msg;
193 }; 227 };
194} 228}
229
230$Coro::State::DIEHOOK = sub {
231 return unless $^S eq 0; # "eq", not "=="
232
233 if ($Coro::current == $Coro::main) {#d#
234 warn "DIEHOOK called in main context, Coro bug?\n";#d#
235 return;#d#
236 }#d#
237
238 # kill coroutine otherwise
239 warn Carp::longmess $_[0];
240 Coro::terminate
241};
242
243$SIG{__DIE__} = sub { }; #d#?
195 244
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 245@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 246@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 247@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 248@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
206for my $pkg (qw( 255for my $pkg (qw(
207 cf::global cf::attachable 256 cf::global cf::attachable
208 cf::object cf::object::player 257 cf::object cf::object::player
209 cf::client cf::player 258 cf::client cf::player
210 cf::arch cf::living 259 cf::arch cf::living
260 cf::map cf::mapspace
211 cf::map cf::party cf::region 261 cf::party cf::region
212)) { 262)) {
213 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 263 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 264}
216 265
217$Event::DIED = sub { 266$EV::DIED = sub {
218 warn "error in event callback: @_"; 267 warn "error in event callback: @_";
219}; 268};
220 269
221############################################################################# 270#############################################################################
222 271
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 294 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 295 $d
247 } || "[unable to dump $_[0]: '$@']"; 296 } || "[unable to dump $_[0]: '$@']";
248} 297}
249 298
250=item $ref = cf::from_json $json 299=item $ref = cf::decode_json $json
251 300
252Converts a JSON string into the corresponding perl data structure. 301Converts a JSON string into the corresponding perl data structure.
253 302
254=item $json = cf::to_json $ref 303=item $json = cf::encode_json $ref
255 304
256Converts a perl data structure into its JSON representation. 305Converts a perl data structure into its JSON representation.
257 306
258=cut 307=cut
259 308
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 309our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 310
262sub to_json ($) { $json_coder->encode ($_[0]) } 311sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 312sub decode_json($) { $json_coder->decode ($_[0]) }
313
314=item cf::post_init { BLOCK }
315
316Execute the given codeblock, I<after> all extensions have been (re-)loaded,
317but I<before> the server starts ticking again.
318
319The cdoeblock will have a single boolean argument to indicate whether this
320is a reload or not.
321
322=cut
323
324sub post_init(&) {
325 push @POST_INIT, shift;
326}
264 327
265=item cf::lock_wait $string 328=item cf::lock_wait $string
266 329
267Wait until the given lock is available. See cf::lock_acquire. 330Wait until the given lock is available. See cf::lock_acquire.
268 331
271Wait until the given lock is available and then acquires it and returns 334Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 335a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 336for example when the coroutine gets canceled), the lock is automatically
274returned. 337returned.
275 338
339Locks are *not* recursive, locking from the same coro twice results in a
340deadlocked coro.
341
276Lock names should begin with a unique identifier (for example, cf::map::find 342Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 343uses map_find and cf::map::load uses map_load).
278 344
279=item $locked = cf::lock_active $string 345=item $locked = cf::lock_active $string
280 346
281Return true if the lock is currently active, i.e. somebody has locked it. 347Return true if the lock is currently active, i.e. somebody has locked it.
282 348
283=cut 349=cut
284 350
285our %LOCK; 351our %LOCK;
352our %LOCKER;#d#
286 353
287sub lock_wait($) { 354sub lock_wait($) {
288 my ($key) = @_; 355 my ($key) = @_;
289 356
357 if ($LOCKER{$key} == $Coro::current) {#d#
358 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
359 return;#d#
360 }#d#
361
290 # wait for lock, if any 362 # wait for lock, if any
291 while ($LOCK{$key}) { 363 while ($LOCK{$key}) {
364 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
292 push @{ $LOCK{$key} }, $Coro::current; 365 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 366 Coro::schedule;
294 } 367 }
295} 368}
296 369
299 372
300 # wait, to be sure we are not locked 373 # wait, to be sure we are not locked
301 lock_wait $key; 374 lock_wait $key;
302 375
303 $LOCK{$key} = []; 376 $LOCK{$key} = [];
377 $LOCKER{$key} = $Coro::current;#d#
304 378
305 Coro::guard { 379 Coro::guard {
380 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 381 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 382 $_->ready for @{ delete $LOCK{$key} };
308 } 383 }
309} 384}
310 385
313 388
314 ! ! $LOCK{$key} 389 ! ! $LOCK{$key}
315} 390}
316 391
317sub freeze_mainloop { 392sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
319 394
320 my $guard = Coro::guard { 395 Coro::guard \&tick_inhibit_dec;
321 $TICK_WATCHER->start; 396}
397
398=item cf::periodic $interval, $cb
399
400Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer.
402
403=cut
404
405sub periodic($$) {
406 my ($interval, $cb) = @_;
407
408 my $start = rand List::Util::min 180, $interval;
409
410 EV::periodic $start, $interval, 0, $cb
411}
412
413=item cf::get_slot $time[, $priority[, $name]]
414
415Allocate $time seconds of blocking CPU time at priority C<$priority>:
416This call blocks and returns only when you have at least C<$time> seconds
417of cpu time till the next tick. The slot is only valid till the next cede.
418
419The optional C<$name> can be used to identify the job to run. It might be
420used for statistical purposes and should identify the same time-class.
421
422Useful for short background jobs.
423
424=cut
425
426our @SLOT_QUEUE;
427our $SLOT_QUEUE;
428
429$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager");
432
433 my $signal = new Coro::Signal;
434
435 while () {
436 next_job:
437 my $avail = cf::till_tick;
438 if ($avail > 0.01) {
439 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) {
441 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send;
443 Coro::cede;
444 goto next_job;
445 }
446 }
447 }
448
449 if (@SLOT_QUEUE) {
450 # we do not use wait_for_tick() as it returns immediately when tick is inactive
451 push @cf::WAIT_FOR_TICK, $signal;
452 $signal->wait;
453 } else {
454 Coro::schedule;
455 }
322 }; 456 }
323 $TICK_WATCHER->stop; 457};
324 $guard 458
459sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main;
461
462 my ($time, $pri, $name) = @_;
463
464 $time = $TICK * .6 if $time > $TICK * .6;
465 my $sig = new Coro::Signal;
466
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready;
470 $sig->wait;
325} 471}
326 472
327=item cf::async { BLOCK } 473=item cf::async { BLOCK }
328 474
329Currently the same as Coro::async_pool, meaning you cannot use 475Currently the same as Coro::async_pool, meaning you cannot use
334 480
335BEGIN { *async = \&Coro::async_pool } 481BEGIN { *async = \&Coro::async_pool }
336 482
337=item cf::sync_job { BLOCK } 483=item cf::sync_job { BLOCK }
338 484
339The design of Crossfire TRT requires that the main coroutine ($Coro::main) 485The design of Deliantra requires that the main coroutine ($Coro::main)
340is always able to handle events or runnable, as Crossfire TRT is only 486is always able to handle events or runnable, as Deliantra is only
341partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 487partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
342acceptable. 488acceptable.
343 489
344If it must be done, put the blocking parts into C<sync_job>. This will run 490If it must be done, put the blocking parts into C<sync_job>. This will run
345the given BLOCK in another coroutine while waiting for the result. The 491the given BLOCK in another coroutine while waiting for the result. The
350 496
351sub sync_job(&) { 497sub sync_job(&) {
352 my ($job) = @_; 498 my ($job) = @_;
353 499
354 if ($Coro::current == $Coro::main) { 500 if ($Coro::current == $Coro::main) {
355 my $time = Event::time; 501 my $time = EV::time;
356 502
357 # this is the main coro, too bad, we have to block 503 # this is the main coro, too bad, we have to block
358 # till the operation succeeds, freezing the server :/ 504 # till the operation succeeds, freezing the server :/
359 505
360 # TODO: use suspend/resume instead 506 LOG llevError, Carp::longmess "sync job";#d#
361 # (but this is cancel-safe) 507
362 my $freeze_guard = freeze_mainloop; 508 my $freeze_guard = freeze_mainloop;
363 509
364 my $busy = 1; 510 my $busy = 1;
365 my @res; 511 my @res;
366 512
367 (async { 513 (async {
514 $Coro::current->desc ("sync job coro");
368 @res = eval { $job->() }; 515 @res = eval { $job->() };
369 warn $@ if $@; 516 warn $@ if $@;
370 undef $busy; 517 undef $busy;
371 })->prio (Coro::PRIO_MAX); 518 })->prio (Coro::PRIO_MAX);
372 519
373 while ($busy) { 520 while ($busy) {
374 Coro::cede or Event::one_event; 521 if (Coro::nready) {
522 Coro::cede_notself;
523 } else {
524 EV::loop EV::LOOP_ONESHOT;
375 } 525 }
526 }
376 527
377 $time = Event::time - $time; 528 my $time = EV::time - $time;
378 529
379 LOG llevError | logBacktrace, Carp::longmess "long sync job"
380 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
381
382 $tick_start += $time; # do not account sync jobs to server load 530 $TICK_START += $time; # do not account sync jobs to server load
383 531
384 wantarray ? @res : $res[0] 532 wantarray ? @res : $res[0]
385 } else { 533 } else {
386 # we are in another coroutine, how wonderful, everything just works 534 # we are in another coroutine, how wonderful, everything just works
387 535
412=item fork_call { }, $args 560=item fork_call { }, $args
413 561
414Executes the given code block with the given arguments in a seperate 562Executes the given code block with the given arguments in a seperate
415process, returning the results. Everything must be serialisable with 563process, returning the results. Everything must be serialisable with
416Coro::Storable. May, of course, block. Note that the executed sub may 564Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 565never block itself or use any form of event handling.
418 566
419=cut 567=cut
420
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429 568
430sub fork_call(&@) { 569sub fork_call(&@) {
431 my ($cb, @args) = @_; 570 my ($cb, @args) = @_;
432 571
433# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 572 # we seemingly have to make a local copy of the whole thing,
434# or die "socketpair: $!"; 573 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 574 # TODO: investigate and fix (likely this will be rather laborious)
436 or die "pipe: $!";
437 575
438 if (my $pid = fork) { 576 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 577 reset_signals;
452 local $SIG{__WARN__}; 578 &$cb
453 local $SIG{__DIE__}; 579 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 580
460 eval { 581 wantarray ? @res : $res[-1]
461 close $fh1; 582}
462 583
463 my @res = eval { $cb->(@args) }; 584=item $coin = coin_from_name $name
464 585
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 586=cut
466 close $fh2;
467 };
468 587
469 warn $@ if $@; 588our %coin_alias = (
470 _exit 0; 589 "silver" => "silvercoin",
471 } 590 "silvercoin" => "silvercoin",
591 "silvercoins" => "silvercoin",
592 "gold" => "goldcoin",
593 "goldcoin" => "goldcoin",
594 "goldcoins" => "goldcoin",
595 "platinum" => "platinacoin",
596 "platinumcoin" => "platinacoin",
597 "platinumcoins" => "platinacoin",
598 "platina" => "platinacoin",
599 "platinacoin" => "platinacoin",
600 "platinacoins" => "platinacoin",
601 "royalty" => "royalty",
602 "royalties" => "royalty",
603);
604
605sub coin_from_name($) {
606 $coin_alias{$_[0]}
607 ? cf::arch::find $coin_alias{$_[0]}
608 : undef
472} 609}
473 610
474=item $value = cf::db_get $family => $key 611=item $value = cf::db_get $family => $key
475 612
476Returns a single value from the environment database. 613Returns a single value from the environment database.
478=item cf::db_put $family => $key => $value 615=item cf::db_put $family => $key => $value
479 616
480Stores the given C<$value> in the family. It can currently store binary 617Stores the given C<$value> in the family. It can currently store binary
481data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 618data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
482 619
620=item $db = cf::db_table "name"
621
622Create and/or open a new database table. The string must not be "db" and must be unique
623within each server.
624
483=cut 625=cut
626
627sub db_table($) {
628 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV;
630
631 eval {
632 $db->set_flags (BDB::CHKSUM);
633
634 utf8::encode $name;
635 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
636 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
637 cf::cleanup "db_open(db): $!" if $!;
638 };
639 cf::cleanup "db_open(db): $@" if $@;
640
641 $db
642}
484 643
485our $DB; 644our $DB;
486 645
487sub db_init { 646sub db_init {
488 unless ($DB) {
489 $DB = BDB::db_create $DB_ENV;
490
491 cf::sync_job { 647 cf::sync_job {
492 eval { 648 $DB ||= db_table "db";
493 $DB->set_flags (BDB::CHKSUM);
494
495 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
497 cf::cleanup "db_open(db): $!" if $!;
498 };
499 cf::cleanup "db_open(db): $@" if $@;
500 };
501 } 649 };
502} 650}
503 651
504sub db_get($$) { 652sub db_get($$) {
505 my $key = "$_[0]/$_[1]"; 653 my $key = "$_[0]/$_[1]";
506 654
556 if (1) { 704 if (1) {
557 $md5 = 705 $md5 =
558 join "\x00", 706 join "\x00",
559 $processversion, 707 $processversion,
560 map { 708 map {
561 Coro::cede; 709 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 710 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 711 } 0.. $#$src;
564 712
565 713
566 my $dbmd5 = db_get cache => "$id/md5"; 714 my $dbmd5 = db_get cache => "$id/md5";
604 752
605############################################################################# 753#############################################################################
606 754
607=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
608 756
609Many objects in crossfire are so-called attachable objects. That means you can 757Many objects in deliantra are so-called attachable objects. That means you can
610attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
611to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
612 760
613In the following description, CLASS can be any of C<global>, C<object> 761In the following description, CLASS can be any of C<global>, C<object>
614C<player>, C<client> or C<map> (i.e. the attachable objects in 762C<player>, C<client> or C<map> (i.e. the attachable objects in
615Crossfire TRT). 763Deliantra).
616 764
617=over 4 765=over 4
618 766
619=item $attachable->attach ($attachment, key => $value...) 767=item $attachable->attach ($attachment, key => $value...)
620 768
664=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
665 813
666Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
667given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
668 816
669Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
670that are attached at load/instantiate time, thus the need for a name. 818that are attached at load/instantiate time, thus the need for a name.
671 819
672These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
673 821
674=over 4 822=over 4
902 } 1050 }
903 1051
904 0 1052 0
905} 1053}
906 1054
907=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
908 1056
909=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1057=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
910 1058
911Generate an object-specific event with the given arguments. 1059Generate an object-specific event with the given arguments.
912 1060
918 1066
919=cut 1067=cut
920 1068
921############################################################################# 1069#############################################################################
922# object support 1070# object support
923#
924 1071
1072sub _object_equal($$);
1073sub _object_equal($$) {
1074 my ($a, $b) = @_;
1075
1076 return 0 unless (ref $a) eq (ref $b);
1077
1078 if ("HASH" eq ref $a) {
1079 my @ka = keys %$a;
1080 my @kb = keys %$b;
1081
1082 return 0 if @ka != @kb;
1083
1084 for (0 .. $#ka) {
1085 return 0 unless $ka[$_] eq $kb[$_];
1086 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1087 }
1088
1089 } elsif ("ARRAY" eq ref $a) {
1090
1091 return 0 if @$a != @$b;
1092
1093 for (0 .. $#$a) {
1094 return 0 unless _object_equal $a->[$_], $b->[$_];
1095 }
1096
1097 } elsif ($a ne $b) {
1098 return 0;
1099 }
1100
1101 1
1102}
1103
1104our $SLOW_MERGES;#d#
925sub _can_merge { 1105sub _can_merge {
926 my ($ob1, $ob2) = @_; 1106 my ($ob1, $ob2) = @_;
927 1107
928 local $Storable::canonical = 1; 1108 ++$SLOW_MERGES;#d#
929 my $fob1 = Storable::freeze $ob1;
930 my $fob2 = Storable::freeze $ob2;
931 1109
932 $fob1 eq $fob2 1110 # we do the slow way here
1111 return _object_equal $ob1, $ob2
933} 1112}
934 1113
935sub reattach { 1114sub reattach {
936 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
937 my ($obj) = @_; 1116 my ($obj) = @_;
938 1117
1118 # no longer needed after getting rid of delete_package?
939 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1119 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
940 1120
941 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
942 1122
943 @$registry = (); 1123 @$registry = ();
944 1124
959cf::attachable->attach ( 1139cf::attachable->attach (
960 prio => -1000000, 1140 prio => -1000000,
961 on_instantiate => sub { 1141 on_instantiate => sub {
962 my ($obj, $data) = @_; 1142 my ($obj, $data) = @_;
963 1143
964 $data = from_json $data; 1144 $data = decode_json $data;
965 1145
966 for (@$data) { 1146 for (@$data) {
967 my ($name, $args) = @$_; 1147 my ($name, $args) = @$_;
968 1148
969 $obj->attach ($name, %{$args || {} }); 1149 $obj->attach ($name, %{$args || {} });
985sub object_freezer_save { 1165sub object_freezer_save {
986 my ($filename, $rdata, $objs) = @_; 1166 my ($filename, $rdata, $objs) = @_;
987 1167
988 sync_job { 1168 sync_job {
989 if (length $$rdata) { 1169 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename);
990 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
991 $filename, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
992 1173
993 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
994 chmod SAVE_MODE, $fh; 1175 aio_chmod $fh, SAVE_MODE;
995 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
996 aio_fsync $fh if $cf::USE_FSYNC; 1177 aio_fsync $fh if $cf::USE_FSYNC;
997 close $fh; 1178 aio_close $fh;
998 1179
999 if (@$objs) { 1180 if (@$objs) {
1000 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1001 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
1002 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1183 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1003 aio_write $fh, 0, (length $data), $data, 0; 1184 aio_write $fh, 0, (length $data), $data, 0;
1004 aio_fsync $fh if $cf::USE_FSYNC; 1185 aio_fsync $fh if $cf::USE_FSYNC;
1005 close $fh; 1186 aio_close $fh;
1006 aio_rename "$filename.pst~", "$filename.pst"; 1187 aio_rename "$filename.pst~", "$filename.pst";
1007 } 1188 }
1008 } else { 1189 } else {
1009 aio_unlink "$filename.pst"; 1190 aio_unlink "$filename.pst";
1010 } 1191 }
1011 1192
1012 aio_rename "$filename~", $filename; 1193 aio_rename "$filename~", $filename;
1194
1195 $filename =~ s%/[^/]+$%%;
1196 aio_pathsync $filename if $cf::USE_FSYNC;
1013 } else { 1197 } else {
1014 warn "FATAL: $filename~: $!\n"; 1198 warn "FATAL: $filename~: $!\n";
1015 } 1199 }
1016 } else { 1200 } else {
1017 aio_unlink $filename; 1201 aio_unlink $filename;
1018 aio_unlink "$filename.pst"; 1202 aio_unlink "$filename.pst";
1019 } 1203 }
1020 } 1204 };
1021} 1205}
1022 1206
1023sub object_freezer_as_string { 1207sub object_freezer_as_string {
1024 my ($rdata, $objs) = @_; 1208 my ($rdata, $objs) = @_;
1025 1209
1037 or return; 1221 or return;
1038 1222
1039 unless (aio_stat "$filename.pst") { 1223 unless (aio_stat "$filename.pst") {
1040 (aio_load "$filename.pst", $av) >= 0 1224 (aio_load "$filename.pst", $av) >= 0
1041 or return; 1225 or return;
1226
1042 $av = eval { (Storable::thaw $av)->{objs} }; 1227 my $st = eval { Coro::Storable::thaw $av };
1228 $av = $st->{objs};
1043 } 1229 }
1044 1230
1231 utf8::decode (my $decname = $filename);
1045 warn sprintf "loading %s (%d)\n", 1232 warn sprintf "loading %s (%d,%d)\n",
1046 $filename, length $data, scalar @{$av || []}; 1233 $decname, length $data, scalar @{$av || []};
1234
1047 return ($data, $av); 1235 ($data, $av)
1048} 1236}
1049 1237
1050=head2 COMMAND CALLBACKS 1238=head2 COMMAND CALLBACKS
1051 1239
1052=over 4 1240=over 4
1106 my ($name, $cb) = @_; 1294 my ($name, $cb) = @_;
1107 1295
1108 $EXTICMD{$name} = $cb; 1296 $EXTICMD{$name} = $cb;
1109} 1297}
1110 1298
1299use File::Glob ();
1300
1111cf::player->attach ( 1301cf::player->attach (
1112 on_command => sub { 1302 on_command => sub {
1113 my ($pl, $name, $params) = @_; 1303 my ($pl, $name, $params) = @_;
1114 1304
1115 my $cb = $COMMAND{$name} 1305 my $cb = $COMMAND{$name}
1125 my ($pl, $buf) = @_; 1315 my ($pl, $buf) = @_;
1126 1316
1127 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1317 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1128 1318
1129 if (ref $msg) { 1319 if (ref $msg) {
1320 my ($type, $reply, @payload) =
1321 "ARRAY" eq ref $msg
1322 ? @$msg
1323 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1324
1325 my @reply;
1326
1130 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1327 if (my $cb = $EXTCMD{$type}) {
1131 if (my %reply = $cb->($pl, $msg)) { 1328 @reply = $cb->($pl, @payload);
1132 $pl->ext_reply ($msg->{msgid}, %reply);
1133 }
1134 } 1329 }
1330
1331 $pl->ext_reply ($reply, @reply)
1332 if $reply;
1333
1135 } else { 1334 } else {
1136 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1335 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1137 } 1336 }
1138 1337
1139 cf::override; 1338 cf::override;
1140 }, 1339 },
1141); 1340);
1341
1342# "readahead" all extensions
1343sub cache_extensions {
1344 my $grp = IO::AIO::aio_group;
1345
1346 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1347 for (grep /\.ext$/, @{$_[0]}) {
1348 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1349 }
1350 };
1351
1352 $grp
1353}
1142 1354
1143sub load_extensions { 1355sub load_extensions {
1144 cf::sync_job { 1356 cf::sync_job {
1145 my %todo; 1357 my %todo;
1146 1358
1166 1378
1167 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1379 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1168 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1380 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1169 1381
1170 $ext{source} = 1382 $ext{source} =
1171 "package $pkg; use strict; use utf8;\n" 1383 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1172 . "#line 1 \"$path\"\n{\n" 1384 . "#line 1 \"$path\"\n{\n"
1173 . $source 1385 . $source
1174 . "\n};\n1"; 1386 . "\n};\n1";
1175 1387
1176 $todo{$base} = \%ext; 1388 $todo{$base} = \%ext;
1192 my $msg = $@ ? "$v->{path}: $@\n" 1404 my $msg = $@ ? "$v->{path}: $@\n"
1193 : "$v->{base}: extension inactive.\n"; 1405 : "$v->{base}: extension inactive.\n";
1194 1406
1195 if (exists $v->{meta}{mandatory}) { 1407 if (exists $v->{meta}{mandatory}) {
1196 warn $msg; 1408 warn $msg;
1197 warn "mandatory extension failed to load, exiting.\n"; 1409 cf::cleanup "mandatory extension failed to load, exiting.";
1198 exit 1;
1199 } 1410 }
1200 1411
1201 warn $msg; 1412 warn $msg;
1202 } 1413 }
1203 1414
1217 1428
1218=back 1429=back
1219 1430
1220=head2 CORE EXTENSIONS 1431=head2 CORE EXTENSIONS
1221 1432
1222Functions and methods that extend core crossfire objects. 1433Functions and methods that extend core deliantra objects.
1223 1434
1224=cut 1435=cut
1225 1436
1226package cf::player; 1437package cf::player;
1227 1438
1228use Coro::AIO; 1439use Coro::AIO;
1229 1440
1230=head3 cf::player 1441=head3 cf::player
1231 1442
1232=over 4 1443=over 4
1444
1445=item cf::player::num_playing
1446
1447Returns the official number of playing players, as per the Crossfire metaserver rules.
1448
1449=cut
1450
1451sub num_playing {
1452 scalar grep
1453 $_->ob->map
1454 && !$_->hidden
1455 && !$_->ob->flag (cf::FLAG_WIZ),
1456 cf::player::list
1457}
1233 1458
1234=item cf::player::find $login 1459=item cf::player::find $login
1235 1460
1236Returns the given player object, loading it if necessary (might block). 1461Returns the given player object, loading it if necessary (might block).
1237 1462
1256 1481
1257sub exists($) { 1482sub exists($) {
1258 my ($login) = @_; 1483 my ($login) = @_;
1259 1484
1260 $cf::PLAYER{$login} 1485 $cf::PLAYER{$login}
1261 or cf::sync_job { !aio_stat path $login } 1486 or !aio_stat path $login
1262} 1487}
1263 1488
1264sub find($) { 1489sub find($) {
1265 return $cf::PLAYER{$_[0]} || do { 1490 return $cf::PLAYER{$_[0]} || do {
1266 my $login = $_[0]; 1491 my $login = $_[0];
1273 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1498 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1274 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1499 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1275 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1500 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1276 aio_unlink +(playerdir $login) . "/$login.pl"; 1501 aio_unlink +(playerdir $login) . "/$login.pl";
1277 1502
1278 my $pl = load_pl path $login 1503 my $f = new_from_file cf::object::thawer path $login
1279 or return; 1504 or return;
1505
1506 my $pl = cf::player::load_pl $f
1507 or return;
1508
1509 local $cf::PLAYER_LOADING{$login} = $pl;
1510 $f->resolve_delayed_derefs;
1280 $cf::PLAYER{$login} = $pl 1511 $cf::PLAYER{$login} = $pl
1281 } 1512 }
1282 } 1513 }
1283} 1514}
1284 1515
1293 return if $pl->{deny_save}; 1524 return if $pl->{deny_save};
1294 1525
1295 aio_mkdir playerdir $pl, 0770; 1526 aio_mkdir playerdir $pl, 0770;
1296 $pl->{last_save} = $cf::RUNTIME; 1527 $pl->{last_save} = $cf::RUNTIME;
1297 1528
1529 cf::get_slot 0.01;
1530
1298 $pl->save_pl ($path); 1531 $pl->save_pl ($path);
1299 Coro::cede; 1532 cf::cede_to_tick;
1300} 1533}
1301 1534
1302sub new($) { 1535sub new($) {
1303 my ($login) = @_; 1536 my ($login) = @_;
1304 1537
1310 $cf::PLAYER{$login} = $self; 1543 $cf::PLAYER{$login} = $self;
1311 1544
1312 $self 1545 $self
1313} 1546}
1314 1547
1548=item $player->send_msg ($channel, $msg, $color, [extra...])
1549
1550=cut
1551
1552sub send_msg {
1553 my $ns = shift->ns
1554 or return;
1555 $ns->send_msg (@_);
1556}
1557
1315=item $pl->quit_character 1558=item $pl->quit_character
1316 1559
1317Nukes the player without looking back. If logged in, the connection will 1560Nukes the player without looking back. If logged in, the connection will
1318be destroyed. May block for a long time. 1561be destroyed. May block for a long time.
1319 1562
1323 my ($pl) = @_; 1566 my ($pl) = @_;
1324 1567
1325 my $name = $pl->ob->name; 1568 my $name = $pl->ob->name;
1326 1569
1327 $pl->{deny_save} = 1; 1570 $pl->{deny_save} = 1;
1328 $pl->password ("*"); # this should lock out the player until we nuked the dir 1571 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1329 1572
1330 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1573 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1331 $pl->deactivate; 1574 $pl->deactivate;
1575 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1576 $pl->ob->check_score;
1332 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1577 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1333 $pl->ns->destroy if $pl->ns; 1578 $pl->ns->destroy if $pl->ns;
1334 1579
1335 my $path = playerdir $pl; 1580 my $path = playerdir $pl;
1336 my $temp = "$path~$cf::RUNTIME~deleting~"; 1581 my $temp = "$path~$cf::RUNTIME~deleting~";
1372 or return []; 1617 or return [];
1373 1618
1374 my @logins; 1619 my @logins;
1375 1620
1376 for my $login (@$dirs) { 1621 for my $login (@$dirs) {
1622 my $path = path $login;
1623
1624 # a .pst is a dead give-away for a valid player
1625 # if no pst file found, open and chekc for blocked users
1626 if (aio_stat "$path.pst") {
1377 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1627 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1378 aio_read $fh, 0, 512, my $buf, 0 or next; 1628 aio_read $fh, 0, 512, my $buf, 0 or next;
1379 $buf !~ /^password -------------$/m or next; # official not-valid tag 1629 $buf !~ /^password -------------$/m or next; # official not-valid tag
1630 }
1380 1631
1381 utf8::decode $login; 1632 utf8::decode $login;
1382 push @logins, $login; 1633 push @logins, $login;
1383 } 1634 }
1384 1635
1411 } 1662 }
1412 1663
1413 \@paths 1664 \@paths
1414} 1665}
1415 1666
1416=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1667=item $protocol_xml = $player->expand_cfpod ($cfpod)
1417 1668
1418Expand crossfire pod fragments into protocol xml. 1669Expand deliantra pod fragments into protocol xml.
1419 1670
1420=cut
1421
1422sub expand_cfpod {
1423 ((my $self), (local $_)) = @_;
1424
1425 # escape & and <
1426 s/&/&amp;/g;
1427 s/(?<![BIUGH])</&lt;/g;
1428
1429 # this is buggy, it needs to properly take care of nested <'s
1430
1431 1 while
1432 # replace B<>, I<>, U<> etc.
1433 s/B<([^\>]*)>/<b>$1<\/b>/
1434 || s/I<([^\>]*)>/<i>$1<\/i>/
1435 || s/U<([^\>]*)>/<u>$1<\/u>/
1436 # replace G<male|female> tags
1437 || s{G<([^>|]*)\|([^>]*)>}{
1438 $self->gender ? $2 : $1
1439 }ge
1440 # replace H<hint text>
1441 || s{H<([^\>]*)>}
1442 {
1443 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1444 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1445 "")
1446 [$self->{hintmode}]
1447 }ge;
1448
1449 # create single paragraphs (very hackish)
1450 s/(?<=\S)\n(?=\w)/ /g;
1451
1452 # compress some whitespace
1453 s/\s+\n/\n/g; # ws line-ends
1454 s/\n\n+/\n/g; # double lines
1455 s/^\n+//; # beginning lines
1456 s/\n+$//; # ending lines
1457
1458 $_
1459}
1460
1461sub hintmode {
1462 $_[0]{hintmode} = $_[1] if @_ > 1;
1463 $_[0]{hintmode}
1464}
1465
1466=item $player->ext_reply ($msgid, %msg) 1671=item $player->ext_reply ($msgid, @msg)
1467 1672
1468Sends an ext reply to the player. 1673Sends an ext reply to the player.
1469 1674
1470=cut 1675=cut
1471 1676
1472sub ext_reply($$%) { 1677sub ext_reply($$@) {
1473 my ($self, $id, %msg) = @_; 1678 my ($self, $id, @msg) = @_;
1474 1679
1475 $msg{msgid} = $id; 1680 $self->ns->ext_reply ($id, @msg)
1476 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1477} 1681}
1478 1682
1479=item $player->ext_event ($type, %msg) 1683=item $player->ext_msg ($type, @msg)
1480 1684
1481Sends an ext event to the client. 1685Sends an ext event to the client.
1482 1686
1483=cut 1687=cut
1484 1688
1485sub ext_event($$%) { 1689sub ext_msg($$@) {
1486 my ($self, $type, %msg) = @_; 1690 my ($self, $type, @msg) = @_;
1487 1691
1488 $self->ns->ext_event ($type, %msg); 1692 $self->ns->ext_msg ($type, @msg);
1489} 1693}
1490 1694
1491=head3 cf::region 1695=head3 cf::region
1492 1696
1493=over 4 1697=over 4
1537our $MAX_RESET = 3600; 1741our $MAX_RESET = 3600;
1538our $DEFAULT_RESET = 3000; 1742our $DEFAULT_RESET = 3000;
1539 1743
1540sub generate_random_map { 1744sub generate_random_map {
1541 my ($self, $rmp) = @_; 1745 my ($self, $rmp) = @_;
1746
1747 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1748
1542 # mit "rum" bekleckern, nicht 1749 # mit "rum" bekleckern, nicht
1543 $self->_create_random_map ( 1750 $self->_create_random_map (
1544 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1751 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1545 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1752 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1546 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1753 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1668 1875
1669# the temporary/swap location 1876# the temporary/swap location
1670sub save_path { 1877sub save_path {
1671 my ($self) = @_; 1878 my ($self) = @_;
1672 1879
1673 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1880 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1674 "$TMPDIR/$path.map" 1881 "$TMPDIR/$path.map"
1675} 1882}
1676 1883
1677# the unique path, undef == no special unique path 1884# the unique path, undef == no special unique path
1678sub uniq_path { 1885sub uniq_path {
1679 my ($self) = @_; 1886 my ($self) = @_;
1680 1887
1681 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1888 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1682 "$UNIQUEDIR/$path" 1889 "$UNIQUEDIR/$path"
1683} 1890}
1684 1891
1685# and all this just because we cannot iterate over 1892# and all this just because we cannot iterate over
1686# all maps in C++... 1893# all maps in C++...
1709 1916
1710sub load_header_from($) { 1917sub load_header_from($) {
1711 my ($self, $path) = @_; 1918 my ($self, $path) = @_;
1712 1919
1713 utf8::encode $path; 1920 utf8::encode $path;
1714 #aio_open $path, O_RDONLY, 0 1921 my $f = new_from_file cf::object::thawer $path
1715 # or return;
1716
1717 $self->_load_header ($path)
1718 or return; 1922 or return;
1923
1924 $self->_load_header ($f)
1925 or return;
1926
1927 local $MAP_LOADING{$self->{path}} = $self;
1928 $f->resolve_delayed_derefs;
1719 1929
1720 $self->{load_path} = $path; 1930 $self->{load_path} = $path;
1721 1931
1722 1 1932 1
1723} 1933}
1777sub find { 1987sub find {
1778 my ($path, $origin) = @_; 1988 my ($path, $origin) = @_;
1779 1989
1780 $path = normalise $path, $origin && $origin->path; 1990 $path = normalise $path, $origin && $origin->path;
1781 1991
1992 cf::lock_wait "map_data:$path";#d#remove
1782 cf::lock_wait "map_find:$path"; 1993 cf::lock_wait "map_find:$path";
1783 1994
1784 $cf::MAP{$path} || do { 1995 $cf::MAP{$path} || do {
1996 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1785 my $guard = cf::lock_acquire "map_find:$path"; 1997 my $guard2 = cf::lock_acquire "map_find:$path";
1998
1786 my $map = new_from_path cf::map $path 1999 my $map = new_from_path cf::map $path
1787 or return; 2000 or return;
1788 2001
1789 $map->{last_save} = $cf::RUNTIME; 2002 $map->{last_save} = $cf::RUNTIME;
1790 2003
1792 or return; 2005 or return;
1793 2006
1794 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2007 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1795 # doing this can freeze the server in a sync job, obviously 2008 # doing this can freeze the server in a sync job, obviously
1796 #$cf::WAIT_FOR_TICK->wait; 2009 #$cf::WAIT_FOR_TICK->wait;
2010 undef $guard2;
2011 undef $guard1;
1797 $map->reset; 2012 $map->reset;
1798 undef $guard;
1799 return find $path; 2013 return find $path;
1800 } 2014 }
1801 2015
1802 $cf::MAP{$path} = $map 2016 $cf::MAP{$path} = $map
1803 } 2017 }
1812 local $self->{deny_reset} = 1; # loading can take a long time 2026 local $self->{deny_reset} = 1; # loading can take a long time
1813 2027
1814 my $path = $self->{path}; 2028 my $path = $self->{path};
1815 2029
1816 { 2030 {
1817 my $guard = cf::lock_acquire "map_load:$path"; 2031 my $guard = cf::lock_acquire "map_data:$path";
1818 2032
2033 return unless $self->valid;
1819 return if $self->in_memory != cf::MAP_SWAPPED; 2034 return unless $self->in_memory == cf::MAP_SWAPPED;
1820 2035
1821 $self->in_memory (cf::MAP_LOADING); 2036 $self->in_memory (cf::MAP_LOADING);
1822 2037
1823 $self->alloc; 2038 $self->alloc;
1824 2039
1825 $self->pre_load; 2040 $self->pre_load;
1826 Coro::cede; 2041 cf::cede_to_tick;
1827 2042
2043 my $f = new_from_file cf::object::thawer $self->{load_path};
2044 $f->skip_block;
1828 $self->_load_objects ($self->{load_path}, 1) 2045 $self->_load_objects ($f)
1829 or return; 2046 or return;
1830 2047
1831 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2048 $self->post_load_original
1832 if delete $self->{load_original}; 2049 if delete $self->{load_original};
1833 2050
1834 if (my $uniq = $self->uniq_path) { 2051 if (my $uniq = $self->uniq_path) {
1835 utf8::encode $uniq; 2052 utf8::encode $uniq;
1836 if (aio_open $uniq, O_RDONLY, 0) { 2053 unless (aio_stat $uniq) {
2054 if (my $f = new_from_file cf::object::thawer $uniq) {
1837 $self->clear_unique_items; 2055 $self->clear_unique_items;
1838 $self->_load_objects ($uniq, 0); 2056 $self->_load_objects ($f);
2057 $f->resolve_delayed_derefs;
2058 }
1839 } 2059 }
1840 } 2060 }
1841 2061
1842 Coro::cede; 2062 $f->resolve_delayed_derefs;
2063
2064 cf::cede_to_tick;
1843 # now do the right thing for maps 2065 # now do the right thing for maps
1844 $self->link_multipart_objects; 2066 $self->link_multipart_objects;
1845 $self->difficulty ($self->estimate_difficulty) 2067 $self->difficulty ($self->estimate_difficulty)
1846 unless $self->difficulty; 2068 unless $self->difficulty;
1847 Coro::cede; 2069 cf::cede_to_tick;
1848 2070
1849 unless ($self->{deny_activate}) { 2071 unless ($self->{deny_activate}) {
1850 $self->decay_objects; 2072 $self->decay_objects;
1851 $self->fix_auto_apply; 2073 $self->fix_auto_apply;
1852 $self->update_buttons; 2074 $self->update_buttons;
1853 Coro::cede; 2075 cf::cede_to_tick;
1854 $self->set_darkness_map; 2076 $self->set_darkness_map;
1855 Coro::cede; 2077 cf::cede_to_tick;
1856 $self->activate; 2078 $self->activate;
1857 } 2079 }
1858 2080
2081 $self->{last_save} = $cf::RUNTIME;
2082 $self->last_access ($cf::RUNTIME);
2083
1859 $self->in_memory (cf::MAP_IN_MEMORY); 2084 $self->in_memory (cf::MAP_ACTIVE);
1860 } 2085 }
1861 2086
1862 $self->post_load; 2087 $self->post_load;
1863} 2088}
1864 2089
1873 2098
1874 $self 2099 $self
1875} 2100}
1876 2101
1877# find and load all maps in the 3x3 area around a map 2102# find and load all maps in the 3x3 area around a map
1878sub load_diag { 2103sub load_neighbours {
1879 my ($map) = @_; 2104 my ($map) = @_;
1880 2105
1881 my @diag; # diagonal neighbours 2106 my @neigh; # diagonal neighbours
1882 2107
1883 for (0 .. 3) { 2108 for (0 .. 3) {
1884 my $neigh = $map->tile_path ($_) 2109 my $neigh = $map->tile_path ($_)
1885 or next; 2110 or next;
1886 $neigh = find $neigh, $map 2111 $neigh = find $neigh, $map
1887 or next; 2112 or next;
1888 $neigh->load; 2113 $neigh->load;
1889 2114
2115 push @neigh,
1890 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2116 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1891 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2117 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1892 } 2118 }
1893 2119
1894 for (@diag) { 2120 for (grep defined $_->[0], @neigh) {
2121 my ($path, $origin) = @$_;
1895 my $neigh = find @$_ 2122 my $neigh = find $path, $origin
1896 or next; 2123 or next;
1897 $neigh->load; 2124 $neigh->load;
1898 } 2125 }
1899} 2126}
1900 2127
1905} 2132}
1906 2133
1907sub do_load_sync { 2134sub do_load_sync {
1908 my ($map) = @_; 2135 my ($map) = @_;
1909 2136
2137 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2138 if $Coro::current == $Coro::main;
2139
1910 cf::sync_job { $map->load }; 2140 cf::sync_job { $map->load };
1911} 2141}
1912 2142
1913our %MAP_PREFETCH; 2143our %MAP_PREFETCH;
1914our $MAP_PREFETCHER = undef; 2144our $MAP_PREFETCHER = undef;
1915 2145
1916sub find_async { 2146sub find_async {
1917 my ($path, $origin) = @_; 2147 my ($path, $origin, $load) = @_;
1918 2148
1919 $path = normalise $path, $origin && $origin->{path}; 2149 $path = normalise $path, $origin && $origin->{path};
1920 2150
1921 if (my $map = $cf::MAP{$path}) { 2151 if (my $map = $cf::MAP{$path}) {
1922 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2152 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1923 } 2153 }
1924 2154
1925 undef $MAP_PREFETCH{$path}; 2155 $MAP_PREFETCH{$path} |= $load;
2156
1926 $MAP_PREFETCHER ||= cf::async { 2157 $MAP_PREFETCHER ||= cf::async {
2158 $Coro::current->{desc} = "map prefetcher";
2159
1927 while (%MAP_PREFETCH) { 2160 while (%MAP_PREFETCH) {
1928 for my $path (keys %MAP_PREFETCH) { 2161 while (my ($k, $v) = each %MAP_PREFETCH) {
1929 if (my $map = find $path) { 2162 if (my $map = find $k) {
1930 $map->load; 2163 $map->load if $v;
1931 } 2164 }
1932 2165
1933 delete $MAP_PREFETCH{$path}; 2166 delete $MAP_PREFETCH{$k};
1934 } 2167 }
1935 } 2168 }
1936 undef $MAP_PREFETCHER; 2169 undef $MAP_PREFETCHER;
1937 }; 2170 };
1938 $MAP_PREFETCHER->prio (6); 2171 $MAP_PREFETCHER->prio (6);
1941} 2174}
1942 2175
1943sub save { 2176sub save {
1944 my ($self) = @_; 2177 my ($self) = @_;
1945 2178
1946 my $lock = cf::lock_acquire "map_data:" . $self->path; 2179 my $lock = cf::lock_acquire "map_data:$self->{path}";
1947 2180
1948 $self->{last_save} = $cf::RUNTIME; 2181 $self->{last_save} = $cf::RUNTIME;
1949 2182
1950 return unless $self->dirty; 2183 return unless $self->dirty;
1951 2184
1957 return if $self->{deny_save}; 2190 return if $self->{deny_save};
1958 2191
1959 local $self->{last_access} = $self->last_access;#d# 2192 local $self->{last_access} = $self->last_access;#d#
1960 2193
1961 cf::async { 2194 cf::async {
2195 $Coro::current->{desc} = "map player save";
1962 $_->contr->save for $self->players; 2196 $_->contr->save for $self->players;
1963 }; 2197 };
2198
2199 cf::get_slot 0.02;
1964 2200
1965 if ($uniq) { 2201 if ($uniq) {
1966 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2202 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1967 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2203 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1968 } else { 2204 } else {
1974 my ($self) = @_; 2210 my ($self) = @_;
1975 2211
1976 # save first because save cedes 2212 # save first because save cedes
1977 $self->save; 2213 $self->save;
1978 2214
1979 my $lock = cf::lock_acquire "map_data:" . $self->path; 2215 my $lock = cf::lock_acquire "map_data:$self->{path}";
1980 2216
1981 return if $self->players; 2217 return if $self->players;
1982 return if $self->in_memory != cf::MAP_IN_MEMORY; 2218 return if $self->in_memory != cf::MAP_ACTIVE;
1983 return if $self->{deny_save}; 2219 return if $self->{deny_save};
1984 2220
2221 $self->in_memory (cf::MAP_SWAPPED);
2222
2223 $self->deactivate;
2224 $_->clear_links_to ($self) for values %cf::MAP;
1985 $self->clear; 2225 $self->clear;
1986 $self->in_memory (cf::MAP_SWAPPED);
1987} 2226}
1988 2227
1989sub reset_at { 2228sub reset_at {
1990 my ($self) = @_; 2229 my ($self) = @_;
1991 2230
2023 if $uniq; 2262 if $uniq;
2024 } 2263 }
2025 2264
2026 delete $cf::MAP{$self->path}; 2265 delete $cf::MAP{$self->path};
2027 2266
2267 $self->deactivate;
2268 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2269 $self->clear;
2029
2030 $_->clear_links_to ($self) for values %cf::MAP;
2031 2270
2032 $self->unlink_save; 2271 $self->unlink_save;
2033 $self->destroy; 2272 $self->destroy;
2034} 2273}
2035 2274
2036my $nuke_counter = "aaaa"; 2275my $nuke_counter = "aaaa";
2037 2276
2038sub nuke { 2277sub nuke {
2039 my ($self) = @_; 2278 my ($self) = @_;
2040 2279
2280 {
2281 my $lock = cf::lock_acquire "map_data:$self->{path}";
2282
2041 delete $cf::MAP{$self->path}; 2283 delete $cf::MAP{$self->path};
2042 2284
2043 $self->unlink_save; 2285 $self->unlink_save;
2044 2286
2045 bless $self, "cf::map"; 2287 bless $self, "cf::map";
2046 delete $self->{deny_reset}; 2288 delete $self->{deny_reset};
2047 $self->{deny_save} = 1; 2289 $self->{deny_save} = 1;
2048 $self->reset_timeout (1); 2290 $self->reset_timeout (1);
2049 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2291 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2050 2292
2051 $cf::MAP{$self->path} = $self; 2293 $cf::MAP{$self->path} = $self;
2294 }
2052 2295
2053 $self->reset; # polite request, might not happen 2296 $self->reset; # polite request, might not happen
2054} 2297}
2055 2298
2056=item $maps = cf::map::tmp_maps 2299=item $maps = cf::map::tmp_maps
2098 2341
2099sub unique_maps() { 2342sub unique_maps() {
2100 [ 2343 [
2101 map { 2344 map {
2102 utf8::decode $_; 2345 utf8::decode $_;
2103 /\.map$/ 2346 s/\.map$//; # TODO future compatibility hack
2347 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2348 ? ()
2104 ? normalise $_ 2349 : normalise $_
2105 : ()
2106 } @{ aio_readdir $UNIQUEDIR or [] } 2350 } @{ aio_readdir $UNIQUEDIR or [] }
2107 ] 2351 ]
2108} 2352}
2109 2353
2110package cf;
2111
2112=back 2354=back
2113 2355
2114=head3 cf::object 2356=head3 cf::object
2115 2357
2116=cut 2358=cut
2119 2361
2120=over 4 2362=over 4
2121 2363
2122=item $ob->inv_recursive 2364=item $ob->inv_recursive
2123 2365
2124Returns the inventory of the object _and_ their inventories, recursively. 2366Returns the inventory of the object I<and> their inventories, recursively,
2367but I<not> the object itself.
2125 2368
2126=cut 2369=cut
2127 2370
2128sub inv_recursive_; 2371sub inv_recursive_;
2129sub inv_recursive_ { 2372sub inv_recursive_ {
2132 2375
2133sub inv_recursive { 2376sub inv_recursive {
2134 inv_recursive_ inv $_[0] 2377 inv_recursive_ inv $_[0]
2135} 2378}
2136 2379
2380=item $ref = $ob->ref
2381
2382Creates and returns a persistent reference to an object that can be stored as a string.
2383
2384=item $ob = cf::object::deref ($refstring)
2385
2386returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2387even if the object actually exists. May block.
2388
2389=cut
2390
2391sub deref {
2392 my ($ref) = @_;
2393
2394 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2395 my ($uuid, $name) = ($1, $2);
2396 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2397 or return;
2398 $pl->ob->uuid eq $uuid
2399 or return;
2400
2401 $pl->ob
2402 } else {
2403 warn "$ref: cannot resolve object reference\n";
2404 undef
2405 }
2406}
2407
2137package cf; 2408package cf;
2138 2409
2139=back 2410=back
2140 2411
2141=head3 cf::object::player 2412=head3 cf::object::player
2147Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2418Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2148can be C<undef>. Does the right thing when the player is currently in a 2419can be C<undef>. Does the right thing when the player is currently in a
2149dialogue with the given NPC character. 2420dialogue with the given NPC character.
2150 2421
2151=cut 2422=cut
2423
2424our $SAY_CHANNEL = {
2425 id => "say",
2426 title => "Map",
2427 reply => "say ",
2428 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2429};
2430
2431our $CHAT_CHANNEL = {
2432 id => "chat",
2433 title => "Chat",
2434 reply => "chat ",
2435 tooltip => "Player chat and shouts, global to the server.",
2436};
2152 2437
2153# rough implementation of a future "reply" method that works 2438# rough implementation of a future "reply" method that works
2154# with dialog boxes. 2439# with dialog boxes.
2155#TODO: the first argument must go, split into a $npc->reply_to ( method 2440#TODO: the first argument must go, split into a $npc->reply_to ( method
2156sub cf::object::player::reply($$$;$) { 2441sub cf::object::player::reply($$$;$) {
2163 2448
2164 } else { 2449 } else {
2165 my $pl = $self->contr; 2450 my $pl = $self->contr;
2166 2451
2167 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2452 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168 my $diag = $pl->{npc_dialog}; 2453 my $dialog = $pl->{npc_dialog};
2169 $diag->{pl}->ext_reply ( 2454 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2170 $diag->{id},
2171 msgtype => "reply",
2172 msg => $diag->{pl}->expand_cfpod ($msg),
2173 add_topics => []
2174 );
2175 2455
2176 } else { 2456 } else {
2177 $msg = $npc->name . " says: $msg" if $npc; 2457 $msg = $npc->name . " says: $msg" if $npc;
2178 $self->message ($msg, $flags); 2458 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2179 } 2459 }
2180 } 2460 }
2461}
2462
2463=item $object->send_msg ($channel, $msg, $color, [extra...])
2464
2465=cut
2466
2467sub cf::object::send_msg {
2468 my $pl = shift->contr
2469 or return;
2470 $pl->send_msg (@_);
2181} 2471}
2182 2472
2183=item $player_object->may ("access") 2473=item $player_object->may ("access")
2184 2474
2185Returns wether the given player is authorized to access resource "access" 2475Returns wether the given player is authorized to access resource "access"
2198 2488
2199=item $player_object->enter_link 2489=item $player_object->enter_link
2200 2490
2201Freezes the player and moves him/her to a special map (C<{link}>). 2491Freezes the player and moves him/her to a special map (C<{link}>).
2202 2492
2203The player should be reasonably safe there for short amounts of time. You 2493The player should be reasonably safe there for short amounts of time (e.g.
2204I<MUST> call C<leave_link> as soon as possible, though. 2494for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2495though, as the palyer cannot control the character while it is on the link
2496map.
2205 2497
2206Will never block. 2498Will never block.
2207 2499
2208=item $player_object->leave_link ($map, $x, $y) 2500=item $player_object->leave_link ($map, $x, $y)
2209 2501
2264 # use -1 or undef as default coordinates, not 0, 0 2556 # use -1 or undef as default coordinates, not 0, 0
2265 ($x, $y) = ($map->enter_x, $map->enter_y) 2557 ($x, $y) = ($map->enter_x, $map->enter_y)
2266 if $x <=0 && $y <= 0; 2558 if $x <=0 && $y <= 0;
2267 2559
2268 $map->load; 2560 $map->load;
2269 $map->load_diag; 2561 $map->load_neighbours;
2270 2562
2271 return unless $self->contr->active; 2563 return unless $self->contr->active;
2564 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2272 $self->activate_recursive; 2565 $self->activate_recursive;
2273 2566
2274 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2567 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2275 $self->enter_map ($map, $x, $y); 2568 $self->enter_map ($map, $x, $y);
2276} 2569}
2281her, loading and preparing them map, calling the provided $check callback 2574her, loading and preparing them map, calling the provided $check callback
2282that has to return the map if sucecssful, and then unfreezes the player on 2575that has to return the map if sucecssful, and then unfreezes the player on
2283the new (success) or old (failed) map position. In either case, $done will 2576the new (success) or old (failed) map position. In either case, $done will
2284be called at the end of this process. 2577be called at the end of this process.
2285 2578
2579Note that $check will be called with a potentially non-loaded map, so if
2580it needs a loaded map it has to call C<< ->load >>.
2581
2286=cut 2582=cut
2287 2583
2288our $GOTOGEN; 2584our $GOTOGEN;
2289 2585
2290sub cf::object::player::goto { 2586sub cf::object::player::goto {
2294 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2590 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2295 2591
2296 $self->enter_link; 2592 $self->enter_link;
2297 2593
2298 (async { 2594 (async {
2595 $Coro::current->{desc} = "player::goto $path $x $y";
2596
2597 # *tag paths override both path and x|y
2598 if ($path =~ /^\*(.*)$/) {
2599 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2600 my $ob = $obs[rand @obs];
2601
2602 # see if we actually can go there
2603 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2604 $ob = $obs[rand @obs];
2605 } else {
2606 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2607 }
2608 # else put us there anyways for now #d#
2609
2610 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2611 } else {
2612 ($path, $x, $y) = (undef, undef, undef);
2613 }
2614 }
2615
2299 my $map = eval { 2616 my $map = eval {
2300 my $map = cf::map::find $path; 2617 my $map = defined $path ? cf::map::find $path : undef;
2301 2618
2302 if ($map) { 2619 if ($map) {
2303 $map = $map->customise_for ($self); 2620 $map = $map->customise_for ($self);
2304 $map = $check->($map) if $check && $map; 2621 $map = $check->($map) if $check && $map;
2305 } else { 2622 } else {
2306 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2623 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2307 } 2624 }
2308 2625
2309 $map 2626 $map
2310 }; 2627 };
2311 2628
2347} 2664}
2348 2665
2349sub prepare_random_map { 2666sub prepare_random_map {
2350 my ($exit) = @_; 2667 my ($exit) = @_;
2351 2668
2352 my $guard = cf::lock_acquire "exit_prepare:$exit";
2353
2354 # all this does is basically replace the /! path by 2669 # all this does is basically replace the /! path by
2355 # a new random map path (?random/...) with a seed 2670 # a new random map path (?random/...) with a seed
2356 # that depends on the exit object 2671 # that depends on the exit object
2357 2672
2358 my $rmp = parse_random_map_params $exit->msg; 2673 my $rmp = parse_random_map_params $exit->msg;
2360 if ($exit->map) { 2675 if ($exit->map) {
2361 $rmp->{region} = $exit->region->name; 2676 $rmp->{region} = $exit->region->name;
2362 $rmp->{origin_map} = $exit->map->path; 2677 $rmp->{origin_map} = $exit->map->path;
2363 $rmp->{origin_x} = $exit->x; 2678 $rmp->{origin_x} = $exit->x;
2364 $rmp->{origin_y} = $exit->y; 2679 $rmp->{origin_y} = $exit->y;
2680
2681 $exit->map->touch;
2365 } 2682 }
2366 2683
2367 $rmp->{random_seed} ||= $exit->random_seed; 2684 $rmp->{random_seed} ||= $exit->random_seed;
2368 2685
2369 my $data = cf::to_json $rmp; 2686 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2370 my $md5 = Digest::MD5::md5_hex $data; 2687 my $md5 = Digest::MD5::md5_hex $data;
2371 my $meta = "$RANDOMDIR/$md5.meta"; 2688 my $meta = "$RANDOMDIR/$md5.meta";
2372 2689
2373 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2690 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2374 aio_write $fh, 0, (length $data), $data, 0; 2691 aio_write $fh, 0, (length $data), $data, 0;
2375 undef $fh; 2692 undef $fh;
2376 aio_rename "$meta~", $meta; 2693 aio_rename "$meta~", $meta;
2377 2694
2695 my $slaying = "?random/$md5";
2696
2697 if ($exit->valid) {
2378 $exit->slaying ("?random/$md5"); 2698 $exit->slaying ("?random/$md5");
2379 $exit->msg (undef); 2699 $exit->msg (undef);
2700 }
2380 } 2701 }
2381} 2702}
2382 2703
2383sub cf::object::player::enter_exit { 2704sub cf::object::player::enter_exit {
2384 my ($self, $exit) = @_; 2705 my ($self, $exit) = @_;
2385 2706
2386 return unless $self->type == cf::PLAYER; 2707 return unless $self->type == cf::PLAYER;
2387 2708
2388 if ($exit->slaying eq "/!") {
2389 #TODO: this should de-fi-ni-te-ly not be a sync-job
2390 # the problem is that $exit might not survive long enough
2391 # so it needs to be done right now, right here
2392 cf::sync_job { prepare_random_map $exit };
2393 }
2394
2395 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2396 my $hp = $exit->stats->hp;
2397 my $sp = $exit->stats->sp;
2398
2399 $self->enter_link; 2709 $self->enter_link;
2400 2710
2401 # if exit is damned, update players death & WoR home-position
2402 $self->contr->savebed ($slaying, $hp, $sp)
2403 if $exit->flag (FLAG_DAMNED);
2404
2405 (async { 2711 (async {
2406 $self->deactivate_recursive; # just to be sure 2712 $Coro::current->{desc} = "enter_exit";
2713
2407 unless (eval { 2714 unless (eval {
2715 $self->deactivate_recursive; # just to be sure
2716
2717 # random map handling
2718 {
2719 my $guard = cf::lock_acquire "exit_prepare:$exit";
2720
2721 prepare_random_map $exit
2722 if $exit->slaying eq "/!";
2723 }
2724
2725 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2726 my $x = $exit->stats->hp;
2727 my $y = $exit->stats->sp;
2728
2408 $self->goto ($slaying, $hp, $sp); 2729 $self->goto ($map, $x, $y);
2409 2730
2731 # if exit is damned, update players death & WoR home-position
2732 $self->contr->savebed ($map, $x, $y)
2733 if $exit->flag (cf::FLAG_DAMNED);
2734
2410 1; 2735 1
2411 }) { 2736 }) {
2412 $self->message ("Something went wrong deep within the crossfire server. " 2737 $self->message ("Something went wrong deep within the deliantra server. "
2413 . "I'll try to bring you back to the map you were before. " 2738 . "I'll try to bring you back to the map you were before. "
2414 . "Please report this to the dungeon master!", 2739 . "Please report this to the dungeon master!",
2415 cf::NDI_UNIQUE | cf::NDI_RED); 2740 cf::NDI_UNIQUE | cf::NDI_RED);
2416 2741
2417 warn "ERROR in enter_exit: $@"; 2742 warn "ERROR in enter_exit: $@";
2445the message, with C<log> being the default. If C<$color> is negative, suppress 2770the message, with C<log> being the default. If C<$color> is negative, suppress
2446the message unless the client supports the msg packet. 2771the message unless the client supports the msg packet.
2447 2772
2448=cut 2773=cut
2449 2774
2775# non-persistent channels (usually the info channel)
2776our %CHANNEL = (
2777 "c/identify" => {
2778 id => "infobox",
2779 title => "Identify",
2780 reply => undef,
2781 tooltip => "Items recently identified",
2782 },
2783 "c/examine" => {
2784 id => "infobox",
2785 title => "Examine",
2786 reply => undef,
2787 tooltip => "Signs and other items you examined",
2788 },
2789 "c/book" => {
2790 id => "infobox",
2791 title => "Book",
2792 reply => undef,
2793 tooltip => "The contents of a note or book",
2794 },
2795 "c/lookat" => {
2796 id => "infobox",
2797 title => "Look",
2798 reply => undef,
2799 tooltip => "What you saw there",
2800 },
2801 "c/who" => {
2802 id => "infobox",
2803 title => "Players",
2804 reply => undef,
2805 tooltip => "Shows players who are currently online",
2806 },
2807 "c/body" => {
2808 id => "infobox",
2809 title => "Body Parts",
2810 reply => undef,
2811 tooltip => "Shows which body parts you posess and are available",
2812 },
2813 "c/skills" => {
2814 id => "infobox",
2815 title => "Skills",
2816 reply => undef,
2817 tooltip => "Shows your experience per skill and item power",
2818 },
2819 "c/uptime" => {
2820 id => "infobox",
2821 title => "Uptime",
2822 reply => undef,
2823 tooltip => "How long the server has been running since last restart",
2824 },
2825 "c/mapinfo" => {
2826 id => "infobox",
2827 title => "Map Info",
2828 reply => undef,
2829 tooltip => "Information related to the maps",
2830 },
2831 "c/party" => {
2832 id => "party",
2833 title => "Party",
2834 reply => "gsay ",
2835 tooltip => "Messages and chat related to your party",
2836 },
2837);
2838
2450sub cf::client::send_msg { 2839sub cf::client::send_msg {
2451 my ($self, $channel, $msg, $color, @extra) = @_; 2840 my ($self, $channel, $msg, $color, @extra) = @_;
2452 2841
2453 $msg = $self->pl->expand_cfpod ($msg); 2842 $msg = $self->pl->expand_cfpod ($msg)
2843 unless $color & cf::NDI_VERBATIM;
2454 2844
2455 $color &= ~cf::NDI_UNIQUE; # just in case... 2845 $color &= cf::NDI_CLIENT_MASK; # just in case...
2456 2846
2847 # check predefined channels, for the benefit of C
2848 if ($CHANNEL{$channel}) {
2849 $channel = $CHANNEL{$channel};
2850
2851 $self->ext_msg (channel_info => $channel)
2852 if $self->can_msg;
2853
2854 $channel = $channel->{id};
2855
2457 if (ref $channel) { 2856 } elsif (ref $channel) {
2458 # send meta info to client, if not yet sent 2857 # send meta info to client, if not yet sent
2459 unless (exists $self->{channel}{$channel->{id}}) { 2858 unless (exists $self->{channel}{$channel->{id}}) {
2460 $self->{channel}{$channel->{id}} = $channel; 2859 $self->{channel}{$channel->{id}} = $channel;
2461 $self->ext_event (channel_info => %$channel); 2860 $self->ext_msg (channel_info => $channel)
2861 if $self->can_msg;
2462 } 2862 }
2463 2863
2464 $channel = $channel->{id}; 2864 $channel = $channel->{id};
2465 } 2865 }
2466 2866
2467 return unless @extra || length $msg; 2867 return unless @extra || length $msg;
2468 2868
2469 if ($self->can_msg) { 2869 if ($self->can_msg) {
2470 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2870 # default colour, mask it out
2871 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2872 if $color & cf::NDI_DEF;
2873
2874 my $pkt = "msg "
2875 . $self->{json_coder}->encode (
2876 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2877 );
2878
2879 # try lzf for large packets
2880 $pkt = "lzf " . Compress::LZF::compress $pkt
2881 if 1024 <= length $pkt and $self->{can_lzf};
2882
2883 # split very large packets
2884 if (8192 < length $pkt and $self->{can_lzf}) {
2885 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2886 $pkt = "frag";
2887 }
2888
2889 $self->send_packet ($pkt);
2471 } else { 2890 } else {
2472 # replace some tags by gcfclient-compatible ones
2473 for ($msg) {
2474 1 while
2475 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2476 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2477 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2478 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2479 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2480 }
2481
2482 if ($color >= 0) { 2891 if ($color >= 0) {
2892 # replace some tags by gcfclient-compatible ones
2893 for ($msg) {
2894 1 while
2895 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2896 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2897 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2898 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2899 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2900 }
2901
2902 $color &= cf::NDI_COLOR_MASK;
2903
2904 utf8::encode $msg;
2905
2483 if (0 && $msg =~ /\[/) { 2906 if (0 && $msg =~ /\[/) {
2907 # COMMAND/INFO
2484 $self->send_packet ("drawextinfo $color 4 0 $msg") 2908 $self->send_packet ("drawextinfo $color 10 8 $msg")
2485 } else { 2909 } else {
2486 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2910 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2487 $self->send_packet ("drawinfo $color $msg") 2911 $self->send_packet ("drawinfo $color $msg")
2488 } 2912 }
2489 } 2913 }
2490 } 2914 }
2491} 2915}
2492 2916
2493=item $client->ext_event ($type, %msg) 2917=item $client->ext_msg ($type, @msg)
2494 2918
2495Sends an ext event to the client. 2919Sends an ext event to the client.
2496 2920
2497=cut 2921=cut
2498 2922
2499sub cf::client::ext_event($$%) { 2923sub cf::client::ext_msg($$@) {
2500 my ($self, $type, %msg) = @_; 2924 my ($self, $type, @msg) = @_;
2501 2925
2502 return unless $self->extcmd; 2926 if ($self->extcmd == 2) {
2503 2927 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2928 } elsif ($self->extcmd == 1) { # TODO: remove
2504 $msg{msgtype} = "event_$type"; 2929 push @msg, msgtype => "event_$type";
2505 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 }
2932}
2933
2934=item $client->ext_reply ($msgid, @msg)
2935
2936Sends an ext reply to the client.
2937
2938=cut
2939
2940sub cf::client::ext_reply($$@) {
2941 my ($self, $id, @msg) = @_;
2942
2943 if ($self->extcmd == 2) {
2944 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2945 } elsif ($self->extcmd == 1) {
2946 #TODO: version 1, remove
2947 unshift @msg, msgtype => "reply", msgid => $id;
2948 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2949 }
2506} 2950}
2507 2951
2508=item $success = $client->query ($flags, "text", \&cb) 2952=item $success = $client->query ($flags, "text", \&cb)
2509 2953
2510Queues a query to the client, calling the given callback with 2954Queues a query to the client, calling the given callback with
2565 my ($ns, $buf) = @_; 3009 my ($ns, $buf) = @_;
2566 3010
2567 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3011 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568 3012
2569 if (ref $msg) { 3013 if (ref $msg) {
3014 my ($type, $reply, @payload) =
3015 "ARRAY" eq ref $msg
3016 ? @$msg
3017 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3018
3019 my @reply;
3020
2570 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3021 if (my $cb = $EXTICMD{$type}) {
2571 if (my %reply = $cb->($ns, $msg)) { 3022 @reply = $cb->($ns, @payload);
2572 $reply{msgid} = $msg->{msgid};
2573 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2574 }
2575 } 3023 }
3024
3025 $ns->ext_reply ($reply, @reply)
3026 if $reply;
3027
2576 } else { 3028 } else {
2577 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3029 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2578 } 3030 }
2579 3031
2580 cf::override; 3032 cf::override;
2627our $safe = new Safe "safe"; 3079our $safe = new Safe "safe";
2628our $safe_hole = new Safe::Hole; 3080our $safe_hole = new Safe::Hole;
2629 3081
2630$SIG{FPE} = 'IGNORE'; 3082$SIG{FPE} = 'IGNORE';
2631 3083
2632$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3084$safe->permit_only (Opcode::opset qw(
3085 :base_core :base_mem :base_orig :base_math
3086 grepstart grepwhile mapstart mapwhile
3087 sort time
3088));
2633 3089
2634# here we export the classes and methods available to script code 3090# here we export the classes and methods available to script code
2635 3091
2636=pod 3092=pod
2637 3093
2638The following functions and methods are available within a safe environment: 3094The following functions and methods are available within a safe environment:
2639 3095
2640 cf::object 3096 cf::object
2641 contr pay_amount pay_player map x y force_find force_add 3097 contr pay_amount pay_player map x y force_find force_add destroy
2642 insert remove 3098 insert remove name archname title slaying race decrease split
2643 3099
2644 cf::object::player 3100 cf::object::player
2645 player 3101 player
2646 3102
2647 cf::player 3103 cf::player
2652 3108
2653=cut 3109=cut
2654 3110
2655for ( 3111for (
2656 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3112 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2657 insert remove)], 3113 insert remove inv nrof name archname title slaying race
3114 decrease split destroy change_exp)],
2658 ["cf::object::player" => qw(player)], 3115 ["cf::object::player" => qw(player)],
2659 ["cf::player" => qw(peaceful)], 3116 ["cf::player" => qw(peaceful)],
2660 ["cf::map" => qw(trigger)], 3117 ["cf::map" => qw(trigger)],
2661) { 3118) {
2662 no strict 'refs'; 3119 no strict 'refs';
2738# the server's init and main functions 3195# the server's init and main functions
2739 3196
2740sub load_facedata($) { 3197sub load_facedata($) {
2741 my ($path) = @_; 3198 my ($path) = @_;
2742 3199
3200 # HACK to clear player env face cache, we need some signal framework
3201 # for this (global event?)
3202 %ext::player_env::MUSIC_FACE_CACHE = ();
3203
3204 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3205
2743 warn "loading facedata from $path\n"; 3206 warn "loading facedata from $path\n";
2744 3207
2745 my $facedata; 3208 my $facedata;
2746 0 < aio_load $path, $facedata 3209 0 < aio_load $path, $facedata
2747 or die "$path: $!"; 3210 or die "$path: $!";
2749 $facedata = Coro::Storable::thaw $facedata; 3212 $facedata = Coro::Storable::thaw $facedata;
2750 3213
2751 $facedata->{version} == 2 3214 $facedata->{version} == 2
2752 or cf::cleanup "$path: version mismatch, cannot proceed."; 3215 or cf::cleanup "$path: version mismatch, cannot proceed.";
2753 3216
3217 # patch in the exptable
3218 $facedata->{resource}{"res/exp_table"} = {
3219 type => FT_RSRC,
3220 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3221 };
3222 cf::cede_to_tick;
3223
2754 { 3224 {
2755 my $faces = $facedata->{faceinfo}; 3225 my $faces = $facedata->{faceinfo};
2756 3226
2757 while (my ($face, $info) = each %$faces) { 3227 while (my ($face, $info) = each %$faces) {
2758 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3228 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3229
2759 cf::face::set_visibility $idx, $info->{visibility}; 3230 cf::face::set_visibility $idx, $info->{visibility};
2760 cf::face::set_magicmap $idx, $info->{magicmap}; 3231 cf::face::set_magicmap $idx, $info->{magicmap};
2761 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3232 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2762 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3233 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2763 3234
2764 cf::cede_to_tick; 3235 cf::cede_to_tick;
2765 } 3236 }
2766 3237
2767 while (my ($face, $info) = each %$faces) { 3238 while (my ($face, $info) = each %$faces) {
2768 next unless $info->{smooth}; 3239 next unless $info->{smooth};
3240
2769 my $idx = cf::face::find $face 3241 my $idx = cf::face::find $face
2770 or next; 3242 or next;
3243
2771 if (my $smooth = cf::face::find $info->{smooth}) { 3244 if (my $smooth = cf::face::find $info->{smooth}) {
2772 cf::face::set_smooth $idx, $smooth; 3245 cf::face::set_smooth $idx, $smooth;
2773 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3246 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2774 } else { 3247 } else {
2775 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3248 warn "smooth face '$info->{smooth}' not found for face '$face'";
2792 3265
2793 { 3266 {
2794 # TODO: for gcfclient pleasure, we should give resources 3267 # TODO: for gcfclient pleasure, we should give resources
2795 # that gcfclient doesn't grok a >10000 face index. 3268 # that gcfclient doesn't grok a >10000 face index.
2796 my $res = $facedata->{resource}; 3269 my $res = $facedata->{resource};
2797 my $enc = JSON::XS->new->utf8->canonical;
2798 3270
2799 while (my ($name, $info) = each %$res) { 3271 while (my ($name, $info) = each %$res) {
2800 my $meta = $enc->encode ({ 3272 if (defined $info->{type}) {
2801 name => $name,
2802 type => $info->{type},
2803 copyright => $info->{copyright}, #TODO#
2804 });
2805
2806 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3273 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3274 my $data;
2807 3275
2808 if ($name =~ /\.jpg$/) { 3276 if ($info->{type} & 1) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3277 # prepend meta info
2810 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3278
3279 my $meta = $enc->encode ({
3280 name => $name,
3281 %{ $info->{meta} || {} },
3282 });
3283
3284 $data = pack "(w/a*)*", $meta, $info->{data};
3285 } else {
3286 $data = $info->{data};
3287 }
3288
3289 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3290 cf::face::set_type $idx, $info->{type};
2811 } else { 3291 } else {
2812 my $data = pack "(w/a*)*", $meta, $info->{data}; 3292 $RESOURCE{$name} = $info;
2813 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814
2815 cf::face::set_type $idx, 1;
2816 cf::face::set_data $idx, 0, $data, $chk;
2817 } 3293 }
2818 3294
2819 cf::cede_to_tick; 3295 cf::cede_to_tick;
2820 } 3296 }
2821 } 3297 }
2822 3298
3299 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3300
2823 1 3301 1
2824} 3302}
2825 3303
3304cf::global->attach (on_resource_update => sub {
3305 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3306 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3307
3308 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3309 my $sound = $soundconf->{compat}[$_]
3310 or next;
3311
3312 my $face = cf::face::find "sound/$sound->[1]";
3313 cf::sound::set $sound->[0] => $face;
3314 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3315 }
3316
3317 while (my ($k, $v) = each %{$soundconf->{event}}) {
3318 my $face = cf::face::find "sound/$v";
3319 cf::sound::set $k => $face;
3320 }
3321 }
3322});
3323
3324register_exticmd fx_want => sub {
3325 my ($ns, $want) = @_;
3326
3327 while (my ($k, $v) = each %$want) {
3328 $ns->fx_want ($k, $v);
3329 }
3330};
3331
3332sub load_resource_file($) {
3333 my $guard = lock_acquire "load_resource_file";
3334
3335 my $status = load_resource_file_ $_[0];
3336 get_slot 0.1, 100;
3337 cf::arch::commit_load;
3338
3339 $status
3340}
3341
2826sub reload_regions { 3342sub reload_regions {
3343 # HACK to clear player env face cache, we need some signal framework
3344 # for this (global event?)
3345 %ext::player_env::MUSIC_FACE_CACHE = ();
3346
2827 load_resource_file "$MAPDIR/regions" 3347 load_resource_file "$MAPDIR/regions"
2828 or die "unable to load regions file\n"; 3348 or die "unable to load regions file\n";
2829 3349
2830 for (cf::region::list) { 3350 for (cf::region::list) {
2831 $_->{match} = qr/$_->{match}/ 3351 $_->{match} = qr/$_->{match}/
2839} 3359}
2840 3360
2841sub reload_archetypes { 3361sub reload_archetypes {
2842 load_resource_file "$DATADIR/archetypes" 3362 load_resource_file "$DATADIR/archetypes"
2843 or die "unable to load archetypes\n"; 3363 or die "unable to load archetypes\n";
2844 #d# NEED to laod twice to resolve forward references
2845 # this really needs to be done in an extra post-pass
2846 # (which needs to be synchronous, so solve it differently)
2847 load_resource_file "$DATADIR/archetypes"
2848 or die "unable to load archetypes\n";
2849} 3364}
2850 3365
2851sub reload_treasures { 3366sub reload_treasures {
2852 load_resource_file "$DATADIR/treasures" 3367 load_resource_file "$DATADIR/treasures"
2853 or die "unable to load treasurelists\n"; 3368 or die "unable to load treasurelists\n";
2854} 3369}
2855 3370
2856sub reload_resources { 3371sub reload_resources {
2857 warn "reloading resource files...\n"; 3372 warn "reloading resource files...\n";
2858 3373
3374 reload_facedata;
3375 reload_archetypes;
2859 reload_regions; 3376 reload_regions;
2860 reload_facedata;
2861 #reload_archetypes;#d#
2862 reload_archetypes;
2863 reload_treasures; 3377 reload_treasures;
2864 3378
2865 warn "finished reloading resource files\n"; 3379 warn "finished reloading resource files\n";
2866} 3380}
2867 3381
2868sub init { 3382sub reload_config {
2869 reload_resources;
2870}
2871
2872sub cfg_load {
2873 open my $fh, "<:utf8", "$CONFDIR/config" 3383 open my $fh, "<:utf8", "$CONFDIR/config"
2874 or return; 3384 or return;
2875 3385
2876 local $/; 3386 local $/;
2877 *CFG = YAML::Syck::Load <$fh>; 3387 *CFG = YAML::Load <$fh>;
2878 3388
2879 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3389 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2880 3390
2881 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3391 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2882 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3392 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2888 }; 3398 };
2889 warn $@ if $@; 3399 warn $@ if $@;
2890 } 3400 }
2891} 3401}
2892 3402
3403sub pidfile() {
3404 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3405 or die "$PIDFILE: $!";
3406 flock $fh, &Fcntl::LOCK_EX
3407 or die "$PIDFILE: flock: $!";
3408 $fh
3409}
3410
3411# make sure only one server instance is running at any one time
3412sub atomic {
3413 my $fh = pidfile;
3414
3415 my $pid = <$fh>;
3416 kill 9, $pid if $pid > 0;
3417
3418 seek $fh, 0, 0;
3419 print $fh $$;
3420}
3421
2893sub main { 3422sub main {
3423 cf::init_globals; # initialise logging
3424
3425 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3426 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3427 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3428 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3429
3430 cf::init_experience;
3431 cf::init_anim;
3432 cf::init_attackmess;
3433 cf::init_dynamic;
3434 cf::init_block;
3435
3436 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3437
2894 # we must not ever block the main coroutine 3438 # we must not ever block the main coroutine
2895 local $Coro::idle = sub { 3439 local $Coro::idle = sub {
2896 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3440 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2897 (async { 3441 (async {
2898 Event::one_event; 3442 $Coro::current->{desc} = "IDLE BUG HANDLER";
3443 EV::loop EV::LOOP_ONESHOT;
2899 })->prio (Coro::PRIO_MAX); 3444 })->prio (Coro::PRIO_MAX);
2900 }; 3445 };
2901 3446
2902 cfg_load; 3447 evthread_start IO::AIO::poll_fileno;
3448
3449 cf::sync_job {
3450 reload_resources;
3451 reload_config;
2903 db_init; 3452 db_init;
3453
3454 cf::load_settings;
3455 cf::load_materials;
3456 cf::init_uuid;
3457 cf::init_signals;
3458 cf::init_commands;
3459 cf::init_skills;
3460
3461 cf::init_beforeplay;
3462
3463 atomic;
3464
2904 load_extensions; 3465 load_extensions;
2905 3466
2906 $TICK_WATCHER->start; 3467 utime time, time, $RUNTIMEFILE;
3468
3469 # no (long-running) fork's whatsoever before this point(!)
3470 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3471
3472 (pop @POST_INIT)->(0) while @POST_INIT;
3473 };
3474
2907 Event::loop; 3475 EV::loop;
2908} 3476}
2909 3477
2910############################################################################# 3478#############################################################################
2911# initialisation and cleanup 3479# initialisation and cleanup
2912 3480
2913# install some emergency cleanup handlers 3481# install some emergency cleanup handlers
2914BEGIN { 3482BEGIN {
3483 our %SIGWATCHER = ();
2915 for my $signal (qw(INT HUP TERM)) { 3484 for my $signal (qw(INT HUP TERM)) {
2916 Event->signal ( 3485 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2917 reentrant => 0,
2918 data => WF_AUTOCANCEL,
2919 signal => $signal,
2920 prio => 0,
2921 cb => sub {
2922 cf::cleanup "SIG$signal"; 3486 cf::cleanup "SIG$signal";
2923 },
2924 ); 3487 };
2925 } 3488 }
2926} 3489}
2927 3490
2928sub write_runtime { 3491sub write_runtime_sync {
2929 my $runtime = "$LOCALDIR/runtime";
2930
2931 # first touch the runtime file to show we are still running: 3492 # first touch the runtime file to show we are still running:
2932 # the fsync below can take a very very long time. 3493 # the fsync below can take a very very long time.
2933 3494
2934 IO::AIO::aio_utime $runtime, undef, undef; 3495 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2935 3496
2936 my $guard = cf::lock_acquire "write_runtime"; 3497 my $guard = cf::lock_acquire "write_runtime";
2937 3498
2938 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3499 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2939 or return; 3500 or return;
2940 3501
2941 my $value = $cf::RUNTIME + 90 + 10; 3502 my $value = $cf::RUNTIME + 90 + 10;
2942 # 10 is the runtime save interval, for a monotonic clock 3503 # 10 is the runtime save interval, for a monotonic clock
2943 # 60 allows for the watchdog to kill the server. 3504 # 60 allows for the watchdog to kill the server.
2953 aio_utime $fh, undef, undef; 3514 aio_utime $fh, undef, undef;
2954 3515
2955 close $fh 3516 close $fh
2956 or return; 3517 or return;
2957 3518
2958 aio_rename "$runtime~", $runtime 3519 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2959 and return; 3520 and return;
2960 3521
2961 warn "runtime file written.\n"; 3522 warn "runtime file written.\n";
2962 3523
2963 1 3524 1
3525}
3526
3527our $uuid_lock;
3528our $uuid_skip;
3529
3530sub write_uuid_sync($) {
3531 $uuid_skip ||= $_[0];
3532
3533 return if $uuid_lock;
3534 local $uuid_lock = 1;
3535
3536 my $uuid = "$LOCALDIR/uuid";
3537
3538 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3539 or return;
3540
3541 my $value = uuid_seq uuid_cur;
3542
3543 unless ($value) {
3544 warn "cowardly refusing to write zero uuid value!\n";
3545 return;
3546 }
3547
3548 my $value = uuid_str $value + $uuid_skip;
3549 $uuid_skip = 0;
3550
3551 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3552 and return;
3553
3554 # always fsync - this file is important
3555 aio_fsync $fh
3556 and return;
3557
3558 close $fh
3559 or return;
3560
3561 aio_rename "$uuid~", $uuid
3562 and return;
3563
3564 warn "uuid file written ($value).\n";
3565
3566 1
3567
3568}
3569
3570sub write_uuid($$) {
3571 my ($skip, $sync) = @_;
3572
3573 $sync ? write_uuid_sync $skip
3574 : async { write_uuid_sync $skip };
2964} 3575}
2965 3576
2966sub emergency_save() { 3577sub emergency_save() {
2967 my $freeze_guard = cf::freeze_mainloop; 3578 my $freeze_guard = cf::freeze_mainloop;
2968 3579
2969 warn "enter emergency perl save\n"; 3580 warn "emergency_perl_save: enter\n";
2970 3581
2971 cf::sync_job { 3582 cf::sync_job {
3583 # this is a trade-off: we want to be very quick here, so
3584 # save all maps without fsync, and later call a global sync
3585 # (which in turn might be very very slow)
3586 local $USE_FSYNC = 0;
3587
2972 # use a peculiar iteration method to avoid tripping on perl 3588 # use a peculiar iteration method to avoid tripping on perl
2973 # refcount bugs in for. also avoids problems with players 3589 # refcount bugs in for. also avoids problems with players
2974 # and maps saved/destroyed asynchronously. 3590 # and maps saved/destroyed asynchronously.
2975 warn "begin emergency player save\n"; 3591 warn "emergency_perl_save: begin player save\n";
2976 for my $login (keys %cf::PLAYER) { 3592 for my $login (keys %cf::PLAYER) {
2977 my $pl = $cf::PLAYER{$login} or next; 3593 my $pl = $cf::PLAYER{$login} or next;
2978 $pl->valid or next; 3594 $pl->valid or next;
3595 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2979 $pl->save; 3596 $pl->save;
2980 } 3597 }
2981 warn "end emergency player save\n"; 3598 warn "emergency_perl_save: end player save\n";
2982 3599
2983 warn "begin emergency map save\n"; 3600 warn "emergency_perl_save: begin map save\n";
2984 for my $path (keys %cf::MAP) { 3601 for my $path (keys %cf::MAP) {
2985 my $map = $cf::MAP{$path} or next; 3602 my $map = $cf::MAP{$path} or next;
2986 $map->valid or next; 3603 $map->valid or next;
2987 $map->save; 3604 $map->save;
2988 } 3605 }
2989 warn "end emergency map save\n"; 3606 warn "emergency_perl_save: end map save\n";
2990 3607
2991 warn "begin emergency database checkpoint\n"; 3608 warn "emergency_perl_save: begin database checkpoint\n";
2992 BDB::db_env_txn_checkpoint $DB_ENV; 3609 BDB::db_env_txn_checkpoint $DB_ENV;
2993 warn "end emergency database checkpoint\n"; 3610 warn "emergency_perl_save: end database checkpoint\n";
3611
3612 warn "emergency_perl_save: begin write uuid\n";
3613 write_uuid_sync 1;
3614 warn "emergency_perl_save: end write uuid\n";
2994 }; 3615 };
2995 3616
3617 warn "emergency_perl_save: starting sync()\n";
3618 IO::AIO::aio_sync sub {
3619 warn "emergency_perl_save: finished sync()\n";
3620 };
3621
2996 warn "leave emergency perl save\n"; 3622 warn "emergency_perl_save: leave\n";
2997} 3623}
2998 3624
2999sub post_cleanup { 3625sub post_cleanup {
3000 my ($make_core) = @_; 3626 my ($make_core) = @_;
3001 3627
3002 warn Carp::longmess "post_cleanup backtrace" 3628 warn Carp::longmess "post_cleanup backtrace"
3003 if $make_core; 3629 if $make_core;
3630
3631 my $fh = pidfile;
3632 unlink $PIDFILE if <$fh> == $$;
3633}
3634
3635# a safer delete_package, copied from Symbol
3636sub clear_package($) {
3637 my $pkg = shift;
3638
3639 # expand to full symbol table name if needed
3640 unless ($pkg =~ /^main::.*::$/) {
3641 $pkg = "main$pkg" if $pkg =~ /^::/;
3642 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3643 $pkg .= '::' unless $pkg =~ /::$/;
3644 }
3645
3646 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3647 my $stem_symtab = *{$stem}{HASH};
3648
3649 defined $stem_symtab and exists $stem_symtab->{$leaf}
3650 or return;
3651
3652 # clear all symbols
3653 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3654 for my $name (keys %$leaf_symtab) {
3655 _gv_clear *{"$pkg$name"};
3656# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3657 }
3658 warn "cleared package $pkg\n";#d#
3004} 3659}
3005 3660
3006sub do_reload_perl() { 3661sub do_reload_perl() {
3007 # can/must only be called in main 3662 # can/must only be called in main
3008 if ($Coro::current != $Coro::main) { 3663 if ($Coro::current != $Coro::main) {
3009 warn "can only reload from main coroutine"; 3664 warn "can only reload from main coroutine";
3010 return; 3665 return;
3011 } 3666 }
3012 3667
3668 return if $RELOAD++;
3669
3670 my $t1 = EV::time;
3671
3672 while ($RELOAD) {
3013 warn "reloading..."; 3673 warn "reloading...";
3014 3674
3015 warn "entering sync_job"; 3675 warn "entering sync_job";
3016 3676
3017 cf::sync_job { 3677 cf::sync_job {
3018 cf::write_runtime; # external watchdog should not bark 3678 cf::write_runtime_sync; # external watchdog should not bark
3019 cf::emergency_save; 3679 cf::emergency_save;
3020 cf::write_runtime; # external watchdog should not bark 3680 cf::write_runtime_sync; # external watchdog should not bark
3021 3681
3022 warn "syncing database to disk"; 3682 warn "syncing database to disk";
3023 BDB::db_env_txn_checkpoint $DB_ENV; 3683 BDB::db_env_txn_checkpoint $DB_ENV;
3024 3684
3025 # if anything goes wrong in here, we should simply crash as we already saved 3685 # if anything goes wrong in here, we should simply crash as we already saved
3026 3686
3027 warn "cancelling all WF_AUTOCANCEL watchers";
3028 for (Event::all_watchers) {
3029 $_->cancel if $_->data & WF_AUTOCANCEL;
3030 }
3031
3032 warn "flushing outstanding aio requests"; 3687 warn "flushing outstanding aio requests";
3033 for (;;) {
3034 BDB::flush;
3035 IO::AIO::flush;
3036 Coro::cede;
3037 last unless IO::AIO::nreqs || BDB::nreqs; 3688 while (IO::AIO::nreqs || BDB::nreqs) {
3038 warn "iterate..."; 3689 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3039 }
3040
3041 ++$RELOAD;
3042
3043 warn "cancelling all extension coros";
3044 $_->cancel for values %EXT_CORO;
3045 %EXT_CORO = ();
3046
3047 warn "removing commands";
3048 %COMMAND = ();
3049
3050 warn "removing ext/exti commands";
3051 %EXTCMD = ();
3052 %EXTICMD = ();
3053
3054 warn "unloading/nuking all extensions";
3055 for my $pkg (@EXTS) {
3056 warn "... unloading $pkg";
3057
3058 if (my $cb = $pkg->can ("unload")) {
3059 eval {
3060 $cb->($pkg);
3061 1
3062 } or warn "$pkg unloaded, but with errors: $@";
3063 } 3690 }
3064 3691
3065 warn "... nuking $pkg"; 3692 warn "cancelling all extension coros";
3066 Symbol::delete_package $pkg; 3693 $_->cancel for values %EXT_CORO;
3067 } 3694 %EXT_CORO = ();
3068 3695
3069 warn "unloading all perl modules loaded from $LIBDIR"; 3696 warn "removing commands";
3070 while (my ($k, $v) = each %INC) { 3697 %COMMAND = ();
3071 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3072 3698
3699 warn "removing ext/exti commands";
3700 %EXTCMD = ();
3701 %EXTICMD = ();
3702
3703 warn "unloading/nuking all extensions";
3704 for my $pkg (@EXTS) {
3073 warn "... unloading $k"; 3705 warn "... unloading $pkg";
3074 delete $INC{$k};
3075 3706
3076 $k =~ s/\.pm$//;
3077 $k =~ s/\//::/g;
3078
3079 if (my $cb = $k->can ("unload_module")) { 3707 if (my $cb = $pkg->can ("unload")) {
3708 eval {
3080 $cb->(); 3709 $cb->($pkg);
3710 1
3711 } or warn "$pkg unloaded, but with errors: $@";
3712 }
3713
3714 warn "... clearing $pkg";
3715 clear_package $pkg;
3081 } 3716 }
3082 3717
3083 Symbol::delete_package $k; 3718 warn "unloading all perl modules loaded from $LIBDIR";
3719 while (my ($k, $v) = each %INC) {
3720 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3721
3722 warn "... unloading $k";
3723 delete $INC{$k};
3724
3725 $k =~ s/\.pm$//;
3726 $k =~ s/\//::/g;
3727
3728 if (my $cb = $k->can ("unload_module")) {
3729 $cb->();
3730 }
3731
3732 clear_package $k;
3084 } 3733 }
3085 3734
3086 warn "getting rid of safe::, as good as possible"; 3735 warn "getting rid of safe::, as good as possible";
3087 Symbol::delete_package "safe::$_" 3736 clear_package "safe::$_"
3088 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3737 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3089 3738
3090 warn "unloading cf.pm \"a bit\""; 3739 warn "unloading cf.pm \"a bit\"";
3091 delete $INC{"cf.pm"}; 3740 delete $INC{"cf.pm"};
3092 delete $INC{"cf/pod.pm"}; 3741 delete $INC{"cf/pod.pm"};
3093 3742
3094 # don't, removes xs symbols, too, 3743 # don't, removes xs symbols, too,
3095 # and global variables created in xs 3744 # and global variables created in xs
3096 #Symbol::delete_package __PACKAGE__; 3745 #clear_package __PACKAGE__;
3097 3746
3098 warn "unload completed, starting to reload now"; 3747 warn "unload completed, starting to reload now";
3099 3748
3100 warn "reloading cf.pm"; 3749 warn "reloading cf.pm";
3101 require cf; 3750 require cf;
3102 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3751 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3103 3752
3104 warn "loading config and database again"; 3753 warn "loading config and database again";
3105 cf::cfg_load; 3754 cf::reload_config;
3106 3755
3107 warn "loading extensions"; 3756 warn "loading extensions";
3108 cf::load_extensions; 3757 cf::load_extensions;
3109 3758
3759 if ($REATTACH_ON_RELOAD) {
3110 warn "reattaching attachments to objects/players"; 3760 warn "reattaching attachments to objects/players";
3111 _global_reattach; # objects, sockets 3761 _global_reattach; # objects, sockets
3112 warn "reattaching attachments to maps"; 3762 warn "reattaching attachments to maps";
3113 reattach $_ for values %MAP; 3763 reattach $_ for values %MAP;
3114 warn "reattaching attachments to players"; 3764 warn "reattaching attachments to players";
3115 reattach $_ for values %PLAYER; 3765 reattach $_ for values %PLAYER;
3766 }
3116 3767
3768 warn "running post_init jobs";
3769 (pop @POST_INIT)->(1) while @POST_INIT;
3770
3117 warn "leaving sync_job"; 3771 warn "leaving sync_job";
3118 3772
3119 1 3773 1
3120 } or do { 3774 } or do {
3121 warn $@; 3775 warn $@;
3122 warn "error while reloading, exiting."; 3776 cf::cleanup "error while reloading, exiting.";
3123 exit 1;
3124 }; 3777 };
3125 3778
3126 warn "reloaded"; 3779 warn "reloaded";
3780 --$RELOAD;
3781 }
3782
3783 $t1 = EV::time - $t1;
3784 warn "reload completed in ${t1}s\n";
3127}; 3785};
3128 3786
3129our $RELOAD_WATCHER; # used only during reload 3787our $RELOAD_WATCHER; # used only during reload
3130 3788
3131sub reload_perl() { 3789sub reload_perl() {
3132 # doing reload synchronously and two reloads happen back-to-back, 3790 # doing reload synchronously and two reloads happen back-to-back,
3133 # coro crashes during coro_state_free->destroy here. 3791 # coro crashes during coro_state_free->destroy here.
3134 3792
3135 $RELOAD_WATCHER ||= Event->timer ( 3793 $RELOAD_WATCHER ||= cf::async {
3136 reentrant => 0, 3794 Coro::AIO::aio_wait cache_extensions;
3137 after => 0, 3795
3138 data => WF_AUTOCANCEL, 3796 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3139 cb => sub {
3140 do_reload_perl; 3797 do_reload_perl;
3141 undef $RELOAD_WATCHER; 3798 undef $RELOAD_WATCHER;
3142 }, 3799 };
3143 ); 3800 };
3144} 3801}
3145 3802
3146register_command "reload" => sub { 3803register_command "reload" => sub {
3147 my ($who, $arg) = @_; 3804 my ($who, $arg) = @_;
3148 3805
3149 if ($who->flag (FLAG_WIZ)) { 3806 if ($who->flag (FLAG_WIZ)) {
3150 $who->message ("reloading server."); 3807 $who->message ("reloading server.");
3808 async {
3809 $Coro::current->{desc} = "perl_reload";
3151 async { reload_perl }; 3810 reload_perl;
3811 };
3152 } 3812 }
3153}; 3813};
3154 3814
3155unshift @INC, $LIBDIR; 3815unshift @INC, $LIBDIR;
3156 3816
3158 3818
3159our @WAIT_FOR_TICK; 3819our @WAIT_FOR_TICK;
3160our @WAIT_FOR_TICK_BEGIN; 3820our @WAIT_FOR_TICK_BEGIN;
3161 3821
3162sub wait_for_tick { 3822sub wait_for_tick {
3163 return unless $TICK_WATCHER->is_active;
3164 return if $Coro::current == $Coro::main; 3823 return if tick_inhibit || $Coro::current == $Coro::main;
3165 3824
3166 my $signal = new Coro::Signal; 3825 my $signal = new Coro::Signal;
3167 push @WAIT_FOR_TICK, $signal; 3826 push @WAIT_FOR_TICK, $signal;
3168 $signal->wait; 3827 $signal->wait;
3169} 3828}
3170 3829
3171sub wait_for_tick_begin { 3830sub wait_for_tick_begin {
3172 return unless $TICK_WATCHER->is_active;
3173 return if $Coro::current == $Coro::main; 3831 return if tick_inhibit || $Coro::current == $Coro::main;
3174 3832
3175 my $signal = new Coro::Signal; 3833 my $signal = new Coro::Signal;
3176 push @WAIT_FOR_TICK_BEGIN, $signal; 3834 push @WAIT_FOR_TICK_BEGIN, $signal;
3177 $signal->wait; 3835 $signal->wait;
3178} 3836}
3179 3837
3180 my $min = 1e6;#d# 3838sub tick {
3181 my $avg = 10;
3182$TICK_WATCHER = Event->timer (
3183 reentrant => 0,
3184 parked => 1,
3185 prio => 0,
3186 at => $NEXT_TICK || $TICK,
3187 data => WF_AUTOCANCEL,
3188 cb => sub {
3189 if ($Coro::current != $Coro::main) { 3839 if ($Coro::current != $Coro::main) {
3190 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3840 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3191 unless ++$bug_warning > 10; 3841 unless ++$bug_warning > 10;
3192 return; 3842 return;
3193 } 3843 }
3194 3844
3195 $NOW = $tick_start = Event::time;
3196
3197 cf::server_tick; # one server iteration 3845 cf::server_tick; # one server iteration
3198 3846
3199 0 && sync_job {#d# 3847 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3200 for(1..10) { 3848 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3201 my $t = Event::time; 3849 Coro::async_pool {
3202 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3850 $Coro::current->{desc} = "runtime saver";
3203 or die; 3851 write_runtime_sync
3204 3852 or warn "ERROR: unable to write runtime file: $!";
3205 $map->width (50);
3206 $map->height (50);
3207 $map->alloc;
3208 $map->_load_objects ("/tmp/x.map", 1);
3209 my $t = Event::time - $t;
3210
3211 #next unless $t < 0.0013;#d#
3212 if ($t < $min) {
3213 $min = $t;
3214 }
3215 $avg = $avg * 0.99 + $t * 0.01;
3216 }
3217 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3218 exit 0;
3219 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3220 }; 3853 };
3854 }
3221 3855
3222 $RUNTIME += $TICK;
3223 $NEXT_TICK += $TICK;
3224
3225 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3226 $NEXT_RUNTIME_WRITE = $NOW + 10;
3227 Coro::async_pool {
3228 write_runtime
3229 or warn "ERROR: unable to write runtime file: $!";
3230 };
3231 }
3232
3233# my $AFTER = Event::time;
3234# warn $AFTER - $NOW;#d#
3235
3236 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3856 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3237 $sig->send; 3857 $sig->send;
3238 } 3858 }
3239 while (my $sig = shift @WAIT_FOR_TICK) { 3859 while (my $sig = shift @WAIT_FOR_TICK) {
3240 $sig->send; 3860 $sig->send;
3241 } 3861 }
3242 3862
3243 $NOW = Event::time; 3863 $LOAD = ($NOW - $TICK_START) / $TICK;
3244
3245 # if we are delayed by four ticks or more, skip them all
3246 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3247
3248 $TICK_WATCHER->at ($NEXT_TICK);
3249 $TICK_WATCHER->start;
3250
3251 $LOAD = ($NOW - $tick_start) / $TICK;
3252 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3864 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3253 3865
3254 _post_tick; 3866 if (0) {
3255 3867 if ($NEXT_TICK) {
3256 3868 my $jitter = $TICK_START - $NEXT_TICK;
3869 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3870 warn "jitter $JITTER\n";#d#
3871 }
3257 }, 3872 }
3258); 3873}
3259 3874
3260{ 3875{
3261 BDB::max_poll_time $TICK * 0.1; 3876 # configure BDB
3262 $BDB_POLL_WATCHER = Event->io ( 3877
3263 reentrant => 0,
3264 fd => BDB::poll_fileno,
3265 poll => 'r',
3266 prio => 0,
3267 data => WF_AUTOCANCEL,
3268 cb => \&BDB::poll_cb,
3269 );
3270 BDB::min_parallel 8; 3878 BDB::min_parallel 8;
3271 3879 BDB::max_poll_reqs $TICK * 0.1;
3272 BDB::set_sync_prepare { 3880 $AnyEvent::BDB::WATCHER->priority (1);
3273 my $status;
3274 my $current = $Coro::current;
3275 (
3276 sub {
3277 $status = $!;
3278 $current->ready; undef $current;
3279 },
3280 sub {
3281 Coro::schedule while defined $current;
3282 $! = $status;
3283 },
3284 )
3285 };
3286 3881
3287 unless ($DB_ENV) { 3882 unless ($DB_ENV) {
3288 $DB_ENV = BDB::db_env_create; 3883 $DB_ENV = BDB::db_env_create;
3884 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3885 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3886 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3887 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3888 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3289 3889
3290 cf::sync_job { 3890 cf::sync_job {
3291 eval { 3891 eval {
3292 BDB::db_env_open 3892 BDB::db_env_open
3293 $DB_ENV, 3893 $DB_ENV,
3295 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3895 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3296 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3896 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3297 0666; 3897 0666;
3298 3898
3299 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3899 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3300
3301 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3302 $DB_ENV->set_lk_detect;
3303 }; 3900 };
3304 3901
3305 cf::cleanup "db_env_open(db): $@" if $@; 3902 cf::cleanup "db_env_open(db): $@" if $@;
3306 }; 3903 };
3307 } 3904 }
3905
3906 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3907 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3908 };
3909 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3910 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3911 };
3912 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3913 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3914 };
3308} 3915}
3309 3916
3310{ 3917{
3918 # configure IO::AIO
3919
3311 IO::AIO::min_parallel 8; 3920 IO::AIO::min_parallel 8;
3312
3313 undef $Coro::AIO::WATCHER;
3314 IO::AIO::max_poll_time $TICK * 0.1; 3921 IO::AIO::max_poll_time $TICK * 0.1;
3315 $AIO_POLL_WATCHER = Event->io ( 3922 undef $AnyEvent::AIO::WATCHER;
3316 reentrant => 0,
3317 data => WF_AUTOCANCEL,
3318 fd => IO::AIO::poll_fileno,
3319 poll => 'r',
3320 prio => 6,
3321 cb => \&IO::AIO::poll_cb,
3322 );
3323} 3923}
3324 3924
3325my $_log_backtrace; 3925my $_log_backtrace;
3326 3926
3327sub _log_backtrace { 3927sub _log_backtrace {
3330 $msg =~ s/\n//; 3930 $msg =~ s/\n//;
3331 3931
3332 # limit the # of concurrent backtraces 3932 # limit the # of concurrent backtraces
3333 if ($_log_backtrace < 2) { 3933 if ($_log_backtrace < 2) {
3334 ++$_log_backtrace; 3934 ++$_log_backtrace;
3935 my $perl_bt = Carp::longmess $msg;
3335 async { 3936 async {
3937 $Coro::current->{desc} = "abt $msg";
3938
3336 my @bt = fork_call { 3939 my @bt = fork_call {
3337 @addr = map { sprintf "%x", $_ } @addr; 3940 @addr = map { sprintf "%x", $_ } @addr;
3338 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3941 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3339 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3942 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3340 or die "addr2line: $!"; 3943 or die "addr2line: $!";
3348 } 3951 }
3349 3952
3350 @funcs 3953 @funcs
3351 }; 3954 };
3352 3955
3353 LOG llevInfo, "[ABT] $msg\n"; 3956 LOG llevInfo, "[ABT] $perl_bt\n";
3957 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3354 LOG llevInfo, "[ABT] $_\n" for @bt; 3958 LOG llevInfo, "[ABT] $_\n" for @bt;
3355 --$_log_backtrace; 3959 --$_log_backtrace;
3356 }; 3960 };
3357 } else { 3961 } else {
3358 LOG llevInfo, "[ABT] $msg\n"; 3962 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines