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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines