ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.287 by root, Mon Jun 25 05:43:45 2007 UTC vs.
Revision 1.454 by root, Thu Sep 25 12:14:32 2008 UTC

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

Diff Legend

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