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.134 by root, Thu Jan 4 17:28:49 2007 UTC vs.
Revision 1.155 by root, Tue Jan 9 21:32:42 2007 UTC

… …
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Data::Dumper;
20use Digest::MD5; 21use Digest::MD5;
21use Fcntl; 22use Fcntl;
22use IO::AIO 2.31 (); 23use IO::AIO 2.32 ();
23use YAML::Syck (); 24use YAML::Syck ();
24use Time::HiRes; 25use Time::HiRes;
25 26
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 27use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 32$YAML::Syck::ImplicitUnicode = 1;
30 33
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 35
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
37our %EXTCMD = (); 38our %EXTCMD = ();
38 39
… …
47our %CFG; 48our %CFG;
48 49
49our $UPTIME; $UPTIME ||= time; 50our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 51our $RUNTIME;
51 52
53our %PLAYER; # all users
52our %MAP; # all maps 54our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 55our $LINK_MAP; # the special {link} map
54our $RANDOM_MAPS = cf::localdir . "/random"; 56our $RANDOM_MAPS = cf::localdir . "/random";
55our %EXT_CORO; 57our %EXT_CORO; # coroutines bound to extensions
58
59our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
60our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
56 61
57binmode STDOUT; 62binmode STDOUT;
58binmode STDERR; 63binmode STDERR;
59 64
60# read virtual server time, if available 65# read virtual server time, if available
… …
105=item %cf::CFG 110=item %cf::CFG
106 111
107Configuration for the server, loaded from C</etc/crossfire/config>, or 112Configuration for the server, loaded from C</etc/crossfire/config>, or
108from wherever your confdir points to. 113from wherever your confdir points to.
109 114
115=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
116
117These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
118or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
119processing has been done. Call C<< ->wait >> on them to maximise the
120window of cpu time available, or simply to synchronise to the server tick.
121
110=back 122=back
111 123
112=cut 124=cut
113 125
114BEGIN { 126BEGIN {
… …
117 utf8::encode $msg; 129 utf8::encode $msg;
118 130
119 $msg .= "\n" 131 $msg .= "\n"
120 unless $msg =~ /\n$/; 132 unless $msg =~ /\n$/;
121 133
122 LOG llevError, "cfperl: $msg"; 134 LOG llevError, $msg;
123 }; 135 };
124} 136}
125 137
126@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 138@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
127@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 139@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
… …
153 165
154=head2 UTILITY FUNCTIONS 166=head2 UTILITY FUNCTIONS
155 167
156=over 4 168=over 4
157 169
170=item dumpval $ref
171
158=cut 172=cut
173
174sub dumpval {
175 eval {
176 local $SIG{__DIE__};
177 my $d;
178 if (1) {
179 $d = new Data::Dumper([$_[0]], ["*var"]);
180 $d->Terse(1);
181 $d->Indent(2);
182 $d->Quotekeys(0);
183 $d->Useqq(1);
184 #$d->Bless(...);
185 $d->Seen($_[1]) if @_ > 1;
186 $d = $d->Dump();
187 }
188 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
189 $d
190 } || "[unable to dump $_[0]: '$@']";
191}
159 192
160use JSON::Syck (); # TODO# replace by JSON::PC once working 193use JSON::Syck (); # TODO# replace by JSON::PC once working
161 194
162=item $ref = cf::from_json $json 195=item $ref = cf::from_json $json
163 196
… …
179sub to_json($) { 212sub to_json($) {
180 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 213 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
181 JSON::Syck::Dump $_[0] 214 JSON::Syck::Dump $_[0]
182} 215}
183 216
184=item my $guard = cf::guard { BLOCK }
185
186Run the given callback when the guard object gets destroyed (useful for
187coroutine cancellations).
188
189You can call C<< ->cancel >> on the guard object to stop the block from
190being executed.
191
192=cut
193
194sub guard(&) {
195 bless \(my $cb = $_[0]), cf::guard::;
196}
197
198sub cf::guard::cancel {
199 ${$_[0]} = sub { };
200}
201
202sub cf::guard::DESTROY {
203 ${$_[0]}->();
204}
205
206=item cf::lock_wait $string 217=item cf::lock_wait $string
207 218
208Wait until the given lock is available. See cf::lock_acquire. 219Wait until the given lock is available. See cf::lock_acquire.
209 220
210=item my $lock = cf::lock_acquire $string 221=item my $lock = cf::lock_acquire $string
211 222
212Wait until the given lock is available and then acquires it and returns 223Wait until the given lock is available and then acquires it and returns
213a guard object. If the guard object gets destroyed (goes out of scope, 224a Coro::guard object. If the guard object gets destroyed (goes out of scope,
214for example when the coroutine gets canceled), the lock is automatically 225for example when the coroutine gets canceled), the lock is automatically
215returned. 226returned.
216 227
217Lock names should begin with a unique identifier (for example, cf::map::find 228Lock names should begin with a unique identifier (for example, cf::map::find
218uses map_find and cf::map::load uses map_load). 229uses map_find and cf::map::load uses map_load).
… …
237 # wait, to be sure we are not locked 248 # wait, to be sure we are not locked
238 lock_wait $key; 249 lock_wait $key;
239 250
240 $LOCK{$key} = []; 251 $LOCK{$key} = [];
241 252
242 cf::guard { 253 Coro::guard {
243 # wake up all waiters, to be on the safe side 254 # wake up all waiters, to be on the safe side
244 $_->ready for @{ delete $LOCK{$key} }; 255 $_->ready for @{ delete $LOCK{$key} };
245 } 256 }
246} 257}
247 258
248=item cf::async { BLOCK }
249
250Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the
251error instead of exiting the server in case of a problem.
252
253=cut
254
255sub async(&) {
256 my ($cb) = @_;
257
258 Coro::async {
259 eval { $cb->() };
260 warn $@ if $@;
261 }
262}
263
264sub freeze_mainloop { 259sub freeze_mainloop {
265 return unless $TICK_WATCHER->is_active; 260 return unless $TICK_WATCHER->is_active;
266 261
267 my $guard = guard { $TICK_WATCHER->start }; 262 my $guard = Coro::guard { $TICK_WATCHER->start };
268 $TICK_WATCHER->stop; 263 $TICK_WATCHER->stop;
269 $guard 264 $guard
270} 265}
266
267=item cf::async { BLOCK }
268
269Currently the same as Coro::async_pool, meaning you cannot use
270C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
271thing you are allowed to do is call C<prio> on it.
272
273=cut
274
275BEGIN { *async = \&Coro::async_pool }
271 276
272=item cf::sync_job { BLOCK } 277=item cf::sync_job { BLOCK }
273 278
274The design of crossfire+ requires that the main coro ($Coro::main) is 279The design of crossfire+ requires that the main coro ($Coro::main) is
275always able to handle events or runnable, as crossfire+ is only partly 280always able to handle events or runnable, as crossfire+ is only partly
… …
294 my $freeze_guard = freeze_mainloop; 299 my $freeze_guard = freeze_mainloop;
295 300
296 my $busy = 1; 301 my $busy = 1;
297 my @res; 302 my @res;
298 303
299 (Coro::async { 304 (async {
300 @res = eval { $job->() }; 305 @res = eval { $job->() };
301 warn $@ if $@; 306 warn $@ if $@;
302 undef $busy; 307 undef $busy;
303 })->prio (Coro::PRIO_MAX); 308 })->prio (Coro::PRIO_MAX);
304 309
305 while ($busy) { 310 while ($busy) {
306 Coro::cede_notself; 311 Coro::cede or Event::one_event;
307 Event::one_event unless Coro::nready;
308 } 312 }
309 313
310 wantarray ? @res : $res[0] 314 wantarray ? @res : $res[0]
311 } else { 315 } else {
312 # we are in another coroutine, how wonderful, everything just works 316 # we are in another coroutine, how wonderful, everything just works
313 317
314 $job->() 318 $job->()
315 } 319 }
316} 320}
317 321
318=item $coro = cf::coro { BLOCK } 322=item $coro = cf::async_ext { BLOCK }
319 323
320Creates and returns a new coro. This coro is automcatially being canceled 324Like async, but this coro is automcatially being canceled when the
321when the extension calling this is being unloaded. 325extension calling this is being unloaded.
322 326
323=cut 327=cut
324 328
325sub coro(&) { 329sub async_ext(&) {
326 my $cb = shift; 330 my $cb = shift;
327 331
328 my $coro = &cf::async ($cb); 332 my $coro = &Coro::async ($cb);
329 333
330 $coro->on_destroy (sub { 334 $coro->on_destroy (sub {
331 delete $EXT_CORO{$coro+0}; 335 delete $EXT_CORO{$coro+0};
332 }); 336 });
333 $EXT_CORO{$coro+0} = $coro; 337 $EXT_CORO{$coro+0} = $coro;
… …
362=cut 366=cut
363 367
364############################################################################# 368#############################################################################
365 369
366package cf::path; 370package cf::path;
371
372# used to convert map paths into valid unix filenames by repalcing / by ∕
373our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
367 374
368sub new { 375sub new {
369 my ($class, $path, $base) = @_; 376 my ($class, $path, $base) = @_;
370 377
371 $path = $path->as_string if ref $path; 378 $path = $path->as_string if ref $path;
… …
435# } 442# }
436} 443}
437 444
438# escape the /'s in the path 445# escape the /'s in the path
439sub _escaped_path { 446sub _escaped_path {
440 # ∕ is U+2215
441 (my $path = $_[0]{path}) =~ s/\//∕/g; 447 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
442 $path 448 $path
443} 449}
444 450
445# the original (read-only) location 451# the original (read-only) location
446sub load_path { 452sub load_path {
… …
1073}; 1079};
1074 1080
1075cf::map->attach (prio => -10000, package => cf::mapsupport::); 1081cf::map->attach (prio => -10000, package => cf::mapsupport::);
1076 1082
1077############################################################################# 1083#############################################################################
1078# load/save perl data associated with player->ob objects
1079
1080sub all_objects(@) {
1081 @_, map all_objects ($_->inv), @_
1082}
1083
1084# TODO: compatibility cruft, remove when no longer needed
1085cf::player->attach (
1086 on_load => sub {
1087 my ($pl, $path) = @_;
1088
1089 for my $o (all_objects $pl->ob) {
1090 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1091 $o->set_ob_key_value ("_perl_data");
1092
1093 %$o = %{ Storable::thaw pack "H*", $value };
1094 }
1095 }
1096 },
1097);
1098
1099#############################################################################
1100 1084
1101=head2 CORE EXTENSIONS 1085=head2 CORE EXTENSIONS
1102 1086
1103Functions and methods that extend core crossfire objects. 1087Functions and methods that extend core crossfire objects.
1104 1088
1089=cut
1090
1091package cf::player;
1092
1093use Coro::AIO;
1094
1105=head3 cf::player 1095=head3 cf::player
1106 1096
1107=over 4 1097=over 4
1108 1098
1109=item cf::player::exists $login 1099=item cf::player::find $login
1110 1100
1111Returns true when the given account exists. 1101Returns the given player object, loading it if necessary (might block).
1112 1102
1113=cut 1103=cut
1114 1104
1115sub cf::player::exists($) { 1105sub playerdir($) {
1116 cf::player::find $_[0] 1106 cf::localdir
1117 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1107 . "/"
1108 . cf::playerdir
1109 . "/"
1110 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1111}
1112
1113sub path($) {
1114 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1115
1116 (playerdir $login) . "/$login.pl"
1117}
1118
1119sub find_active($) {
1120 $cf::PLAYER{$_[0]}
1121 and $cf::PLAYER{$_[0]}->active
1122 and $cf::PLAYER{$_[0]}
1123}
1124
1125sub exists($) {
1126 my ($login) = @_;
1127
1128 $cf::PLAYER{$login}
1129 or cf::sync_job { !aio_stat $login }
1130}
1131
1132sub find($) {
1133 return $cf::PLAYER{$_[0]} || do {
1134 my $login = $_[0];
1135
1136 my $guard = cf::lock_acquire "user_find:$login";
1137
1138 $cf::PLAYER{$_[0]} || do {
1139 my $pl = load_pl path $login
1140 or return;
1141 $cf::PLAYER{$login} = $pl
1142 }
1143 }
1144}
1145
1146sub save($) {
1147 my ($pl) = @_;
1148
1149 return if $pl->{deny_save};
1150
1151 my $path = path $pl;
1152 my $guard = cf::lock_acquire "user_save:$path";
1153
1154 return if $pl->{deny_save};
1155
1156 aio_mkdir playerdir $pl, 0770;
1157 $pl->{last_save} = $cf::RUNTIME;
1158
1159 $pl->save_pl ($path);
1160 Coro::cede;
1161}
1162
1163sub new($) {
1164 my ($login) = @_;
1165
1166 my $self = create;
1167
1168 $self->ob->name ($login);
1169 $self->{deny_save} = 1;
1170
1171 $cf::PLAYER{$login} = $self;
1172
1173 $self
1174}
1175
1176=item $pl->quit_character
1177
1178Nukes the player without looking back. If logged in, the connection will
1179be destroyed. May block for a long time.
1180
1181=cut
1182
1183sub quit_character {
1184 my ($pl) = @_;
1185
1186 $pl->{deny_save} = 1;
1187 $pl->password ("*"); # this should lock out the player until we nuked the dir
1188
1189 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1190 $pl->deactivate;
1191 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1192 $pl->ns->destroy if $pl->ns;
1193
1194 my $path = playerdir $pl;
1195 my $temp = "$path~$cf::RUNTIME~deleting~";
1196 aio_rename $path, $temp;
1197 delete $cf::PLAYER{$pl->ob->name};
1198 $pl->destroy;
1199 IO::AIO::aio_rmtree $temp;
1200}
1201
1202=item cf::player::list_logins
1203
1204Returns am arrayref of all valid playernames in the system, can take a
1205while and may block, so not sync_job-capable, ever.
1206
1207=cut
1208
1209sub list_logins {
1210 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1211 or return [];
1212
1213 my @logins;
1214
1215 for my $login (@$dirs) {
1216 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1217 aio_read $fh, 0, 512, my $buf, 0 or next;
1218 $buf !~ /^password -------------$/m or next; # official not-valid tag
1219
1220 utf8::decode $login;
1221 push @logins, $login;
1222 }
1223
1224 \@logins
1225}
1226
1227=item $player->maps
1228
1229Returns an arrayref of cf::path's of all maps that are private for this
1230player. May block.
1231
1232=cut
1233
1234sub maps($) {
1235 my ($pl) = @_;
1236
1237 my $files = aio_readdir playerdir $pl
1238 or return;
1239
1240 my @paths;
1241
1242 for (@$files) {
1243 utf8::decode $_;
1244 next if /\.(?:pl|pst)$/;
1245 next unless /^$PATH_SEP/;
1246
1247 s/$PATH_SEP/\//g;
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1249 }
1250
1251 \@paths
1118} 1252}
1119 1253
1120=item $player->ext_reply ($msgid, $msgtype, %msg) 1254=item $player->ext_reply ($msgid, $msgtype, %msg)
1121 1255
1122Sends an ext reply to the player. 1256Sends an ext reply to the player.
1123 1257
1124=cut 1258=cut
1125 1259
1126sub cf::player::ext_reply($$$%) { 1260sub ext_reply($$$%) {
1127 my ($self, $id, %msg) = @_; 1261 my ($self, $id, %msg) = @_;
1128 1262
1129 $msg{msgid} = $id; 1263 $msg{msgid} = $id;
1130 1264
1131 $self->send ("ext " . to_json \%msg); 1265 $self->send ("ext " . cf::to_json \%msg);
1132} 1266}
1267
1268package cf;
1133 1269
1134=back 1270=back
1135 1271
1136 1272
1137=head3 cf::map 1273=head3 cf::map
… …
1184 or return; 1320 or return;
1185 1321
1186 my $map = cf::map::new 1322 my $map = cf::map::new
1187 or return; 1323 or return;
1188 1324
1325 # for better error messages only, will be overwritten
1326 $map->path ($path);
1327
1189 $map->load_header ($path) 1328 $map->load_header ($path)
1190 or return; 1329 or return;
1191 1330
1192 $map->{load_path} = $path; 1331 $map->{load_path} = $path;
1193 1332
… …
1315} 1454}
1316 1455
1317sub save { 1456sub save {
1318 my ($self) = @_; 1457 my ($self) = @_;
1319 1458
1459 my $lock = cf::lock_acquire "map_data:" . $self->path;
1460
1320 $self->{last_save} = $cf::RUNTIME; 1461 $self->{last_save} = $cf::RUNTIME;
1321 1462
1322 return unless $self->dirty; 1463 return unless $self->dirty;
1323 1464
1324 my $save = $self->{path}->save_path; utf8::encode $save; 1465 my $save = $self->{path}->save_path; utf8::encode $save;
… …
1327 $self->{load_path} = $save; 1468 $self->{load_path} = $save;
1328 1469
1329 return if $self->{deny_save}; 1470 return if $self->{deny_save};
1330 1471
1331 local $self->{last_access} = $self->last_access;#d# 1472 local $self->{last_access} = $self->last_access;#d#
1473
1474 cf::async {
1475 $_->contr->save for $self->players;
1476 };
1332 1477
1333 if ($uniq) { 1478 if ($uniq) {
1334 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1479 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1335 $self->save_objects ($uniq, cf::IO_UNIQUES); 1480 $self->save_objects ($uniq, cf::IO_UNIQUES);
1336 } else { 1481 } else {
… …
1342 my ($self) = @_; 1487 my ($self) = @_;
1343 1488
1344 # save first because save cedes 1489 # save first because save cedes
1345 $self->save; 1490 $self->save;
1346 1491
1492 my $lock = cf::lock_acquire "map_data:" . $self->path;
1493
1347 return if $self->players; 1494 return if $self->players;
1348 return if $self->in_memory != cf::MAP_IN_MEMORY; 1495 return if $self->in_memory != cf::MAP_IN_MEMORY;
1349 return if $self->{deny_save}; 1496 return if $self->{deny_save};
1350 1497
1351 $self->clear; 1498 $self->clear;
… …
1393} 1540}
1394 1541
1395sub reset { 1542sub reset {
1396 my ($self) = @_; 1543 my ($self) = @_;
1397 1544
1545 my $lock = cf::lock_acquire "map_data:" . $self->path;
1546
1398 return if $self->players; 1547 return if $self->players;
1399 return if $self->{path}{user_rel};#d# 1548 return if $self->{path}{user_rel};#d#
1400 1549
1401 warn "resetting map ", $self->path;#d# 1550 warn "resetting map ", $self->path;#d#
1402 1551
… …
1427 } 1576 }
1428 1577
1429 $map 1578 $map
1430} 1579}
1431 1580
1432sub emergency_save {
1433 my $freeze_guard = cf::freeze_mainloop;
1434
1435 warn "enter emergency map save\n";
1436
1437 cf::sync_job {
1438 warn "begin emergency map save\n";
1439 $_->save for values %cf::MAP;
1440 };
1441
1442 warn "end emergency map save\n";
1443}
1444
1445package cf; 1581package cf;
1446 1582
1447=back 1583=back
1448 1584
1585=head3 cf::object
1586
1587=cut
1588
1589package cf::object;
1590
1591=over 4
1592
1593=item $ob->inv_recursive
1594
1595Returns the inventory of the object _and_ their inventories, recursively.
1596
1597=cut
1598
1599sub inv_recursive_;
1600sub inv_recursive_ {
1601 map { $_, inv_recursive_ $_->inv } @_
1602}
1603
1604sub inv_recursive {
1605 inv_recursive_ inv $_[0]
1606}
1607
1608package cf;
1609
1610=back
1449 1611
1450=head3 cf::object::player 1612=head3 cf::object::player
1451 1613
1452=over 4 1614=over 4
1453 1615
… …
1546 ($x, $y) = ($map->enter_x, $map->enter_y) 1708 ($x, $y) = ($map->enter_x, $map->enter_y)
1547 if $x <=0 && $y <= 0; 1709 if $x <=0 && $y <= 0;
1548 1710
1549 $map->load; 1711 $map->load;
1550 1712
1713 return unless $self->contr->active;
1551 $self->activate_recursive; 1714 $self->activate_recursive;
1552 $self->enter_map ($map, $x, $y); 1715 $self->enter_map ($map, $x, $y);
1553} 1716}
1554 1717
1555cf::player->attach ( 1718cf::player->attach (
… …
1568 1731
1569 # try to abort aborted map switching on player login :) 1732 # try to abort aborted map switching on player login :)
1570 # should happen only on crashes 1733 # should happen only on crashes
1571 if ($pl->ob->{_link_pos}) { 1734 if ($pl->ob->{_link_pos}) {
1572 $pl->ob->enter_link; 1735 $pl->ob->enter_link;
1573 cf::async { 1736 (async {
1574 # we need this sleep as the login has a concurrent enter_exit running 1737 # we need this sleep as the login has a concurrent enter_exit running
1575 # and this sleep increases chances of the player not ending up in scorn 1738 # and this sleep increases chances of the player not ending up in scorn
1739 $pl->ob->reply (undef,
1740 "There was an internal problem at your last logout, "
1741 . "the server will try to bring you to your intended destination in a second.",
1742 cf::NDI_RED);
1576 Coro::Timer::sleep 1; 1743 Coro::Timer::sleep 1;
1577 $pl->ob->leave_link; 1744 $pl->ob->leave_link;
1578 }; 1745 })->prio (2);
1579 } 1746 }
1580 }, 1747 },
1581); 1748);
1582 1749
1583=item $player_object->goto_map ($path, $x, $y) 1750=item $player_object->goto ($path, $x, $y)
1584 1751
1585=cut 1752=cut
1586 1753
1587sub cf::object::player::goto_map { 1754sub cf::object::player::goto {
1588 my ($self, $path, $x, $y) = @_; 1755 my ($self, $path, $x, $y) = @_;
1589 1756
1757 $path = new cf::path $path;
1758 $path ne "/" or Carp::cluck ("oy");#d#
1759
1590 $self->enter_link; 1760 $self->enter_link;
1591 1761
1592 (cf::async { 1762 (async {
1593 $path = new cf::path $path;
1594
1595 my $map = cf::map::find $path->as_string; 1763 my $map = cf::map::find $path->as_string;
1596 $map = $map->customise_for ($self) if $map; 1764 $map = $map->customise_for ($self) if $map;
1597 1765
1598# warn "entering ", $map->path, " at ($x, $y)\n" 1766# warn "entering ", $map->path, " at ($x, $y)\n"
1599# if $map; 1767# if $map;
1600 1768
1601 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1769 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1602 1770
1603 $self->leave_link ($map, $x, $y); 1771 $self->leave_link ($map, $x, $y);
1604 })->prio (1); 1772 })->prio (1);
1605} 1773}
1606 1774
… …
1659 1827
1660 return unless $self->type == cf::PLAYER; 1828 return unless $self->type == cf::PLAYER;
1661 1829
1662 $self->enter_link; 1830 $self->enter_link;
1663 1831
1664 (cf::async { 1832 (async {
1665 $self->deactivate_recursive; # just to be sure 1833 $self->deactivate_recursive; # just to be sure
1666 unless (eval { 1834 unless (eval {
1667 prepare_random_map $exit 1835 prepare_random_map $exit
1668 if $exit->slaying eq "/!"; 1836 if $exit->slaying eq "/!";
1669 1837
1670 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1838 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1671 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1839 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1672 1840
1673 1; 1841 1;
1674 }) { 1842 }) {
1675 $self->message ("Something went wrong deep within the crossfire server. " 1843 $self->message ("Something went wrong deep within the crossfire server. "
1676 . "I'll try to bring you back to the map you were before. " 1844 . "I'll try to bring you back to the map you were before. "
… …
1750 } 1918 }
1751 } 1919 }
1752 }, 1920 },
1753); 1921);
1754 1922
1755=item $client->coro (\&cb) 1923=item $client->async (\&cb)
1756 1924
1757Create a new coroutine, running the specified callback. The coroutine will 1925Create a new coroutine, running the specified callback. The coroutine will
1758be automatically cancelled when the client gets destroyed (e.g. on logout, 1926be automatically cancelled when the client gets destroyed (e.g. on logout,
1759or loss of connection). 1927or loss of connection).
1760 1928
1761=cut 1929=cut
1762 1930
1763sub cf::client::coro { 1931sub cf::client::async {
1764 my ($self, $cb) = @_; 1932 my ($self, $cb) = @_;
1765 1933
1766 my $coro = &cf::async ($cb); 1934 my $coro = &Coro::async ($cb);
1767 1935
1768 $coro->on_destroy (sub { 1936 $coro->on_destroy (sub {
1769 delete $self->{_coro}{$coro+0}; 1937 delete $self->{_coro}{$coro+0};
1770 }); 1938 });
1771 1939
… …
2009 local $/; 2177 local $/;
2010 *CFG = YAML::Syck::Load <$fh>; 2178 *CFG = YAML::Syck::Load <$fh>;
2011 2179
2012 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2180 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2013 2181
2182 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2183 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2184
2014 if (exists $CFG{mlockall}) { 2185 if (exists $CFG{mlockall}) {
2015 eval { 2186 eval {
2016 $CFG{mlockall} ? &mlockall : &munlockall 2187 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2017 and die "WARNING: m(un)lockall failed: $!\n"; 2188 and die "WARNING: m(un)lockall failed: $!\n";
2018 }; 2189 };
2019 warn $@ if $@; 2190 warn $@ if $@;
2020 } 2191 }
2021} 2192}
2022 2193
2023sub main { 2194sub main {
2024 # we must not ever block the main coroutine 2195 # we must not ever block the main coroutine
2025 local $Coro::idle = sub { 2196 local $Coro::idle = sub {
2026 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2197 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2027 (Coro::unblock_sub {
2028 Event::one_event; 2198 async { Event::one_event };
2029 })->();
2030 }; 2199 };
2031 2200
2032 cfg_load; 2201 cfg_load;
2033 db_load; 2202 db_load;
2034 load_extensions; 2203 load_extensions;
2035 Event::loop; 2204 Event::loop;
2036} 2205}
2037 2206
2038############################################################################# 2207#############################################################################
2039# initialisation 2208# initialisation and cleanup
2209
2210# install some emergency cleanup handlers
2211BEGIN {
2212 for my $signal (qw(INT HUP TERM)) {
2213 Event->signal (
2214 data => WF_AUTOCANCEL,
2215 signal => $signal,
2216 cb => sub {
2217 cf::cleanup "SIG$signal";
2218 },
2219 );
2220 }
2221}
2222
2223sub emergency_save {
2224 my $freeze_guard = cf::freeze_mainloop;
2225
2226 warn "enter emergency perl save\n";
2227
2228 cf::sync_job {
2229 # use a peculiar iteration method to avoid tripping on perl
2230 # refcount bugs in for. also avoids problems with players
2231 # and maps saved/Destroyed asynchronously.
2232 warn "begin emergency player save\n";
2233 for my $login (keys %cf::PLAYER) {
2234 my $pl = $cf::PLAYER{$login} or next;
2235 $pl->valid or next;
2236 $pl->save;
2237 }
2238 warn "end emergency player save\n";
2239
2240 warn "begin emergency map save\n";
2241 for my $path (keys %cf::MAP) {
2242 my $map = $cf::MAP{$path} or next;
2243 $map->valid or next;
2244 $map->save;
2245 }
2246 warn "end emergency map save\n";
2247 };
2248
2249 warn "leave emergency perl save\n";
2250}
2040 2251
2041sub reload() { 2252sub reload() {
2042 # can/must only be called in main 2253 # can/must only be called in main
2043 if ($Coro::current != $Coro::main) { 2254 if ($Coro::current != $Coro::main) {
2044 warn "can only reload from main coroutine\n"; 2255 warn "can only reload from main coroutine\n";
… …
2117 cf::load_extensions; 2328 cf::load_extensions;
2118 2329
2119 # reattach attachments to objects 2330 # reattach attachments to objects
2120 warn "reattach"; 2331 warn "reattach";
2121 _global_reattach; 2332 _global_reattach;
2333 reattach $_ for values %MAP;
2122 }; 2334 };
2123 2335
2124 if ($@) { 2336 if ($@) {
2125 warn $@; 2337 warn $@;
2126 warn "error while reloading, exiting."; 2338 warn "error while reloading, exiting.";
… …
2142 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2354 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2143 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2355 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2144 2356
2145 # dirty hack because... archetypes are not yet loaded 2357 # dirty hack because... archetypes are not yet loaded
2146 Event->timer ( 2358 Event->timer (
2147 after => 2, 2359 after => 10,
2148 cb => sub { 2360 cb => sub {
2149 $_[0]->w->cancel; 2361 $_[0]->w->cancel;
2150 2362
2151 # provide some exits "home" 2363 # provide some exits "home"
2152 my $exit = cf::object::new "exit"; 2364 my $exit = cf::object::new "exit";
… …
2194 data => WF_AUTOCANCEL, 2406 data => WF_AUTOCANCEL,
2195 cb => sub { 2407 cb => sub {
2196 cf::server_tick; # one server iteration 2408 cf::server_tick; # one server iteration
2197 $RUNTIME += $TICK; 2409 $RUNTIME += $TICK;
2198 $NEXT_TICK += $TICK; 2410 $NEXT_TICK += $TICK;
2411
2412 $WAIT_FOR_TICK->broadcast;
2413 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2199 2414
2200 # if we are delayed by four ticks or more, skip them all 2415 # if we are delayed by four ticks or more, skip them all
2201 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2416 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2202 2417
2203 $TICK_WATCHER->at ($NEXT_TICK); 2418 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

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