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

Diff Legend

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