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.290 by root, Mon Jul 2 03:15:30 2007 UTC vs.
Revision 1.466 by root, Thu Jan 8 03:03:24 2009 UTC

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

Diff Legend

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