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.289 by root, Sat Jun 30 03:00:54 2007 UTC vs.
Revision 1.452 by root, Tue Sep 23 00:24:52 2008 UTC

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

Diff Legend

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