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

Diff Legend

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