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.131 by root, Thu Jan 4 00:53:54 2007 UTC vs.
Revision 1.148 by root, Mon Jan 8 12:39:16 2007 UTC

… …
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Digest::MD5; 20use Digest::MD5;
21use Fcntl; 21use Fcntl;
22use IO::AIO 2.31 (); 22use IO::AIO 2.32 ();
23use YAML::Syck (); 23use YAML::Syck ();
24use Time::HiRes; 24use Time::HiRes;
25 25
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 26use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 27
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 29$YAML::Syck::ImplicitUnicode = 1;
30 30
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 34
35our %COMMAND = (); 35our %COMMAND = ();
36our %COMMAND_TIME = (); 36our %COMMAND_TIME = ();
… …
47our %CFG; 47our %CFG;
48 48
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %PLAYER; # all users
52our %MAP; # all maps 53our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 54our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 55our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 56our %EXT_CORO; # coroutines bound to extensions
57 57
58binmode STDOUT; 58binmode STDOUT;
59binmode STDERR; 59binmode STDERR;
60 60
61# read virtual server time, if available 61# read virtual server time, if available
… …
118 utf8::encode $msg; 118 utf8::encode $msg;
119 119
120 $msg .= "\n" 120 $msg .= "\n"
121 unless $msg =~ /\n$/; 121 unless $msg =~ /\n$/;
122 122
123 LOG llevError, "cfperl: $msg"; 123 LOG llevError, $msg;
124 }; 124 };
125} 125}
126 126
127@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 127@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
128@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 128@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
… …
180sub to_json($) { 180sub to_json($) {
181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
182 JSON::Syck::Dump $_[0] 182 JSON::Syck::Dump $_[0]
183} 183}
184 184
185=item my $guard = cf::guard { BLOCK }
186
187Run the given callback when the guard object gets destroyed (useful for
188coroutine cancellations).
189
190You can call C<< ->cancel >> on the guard object to stop the block from
191being executed.
192
193=cut
194
195sub guard(&) {
196 bless \(my $cb = $_[0]), cf::guard::;
197}
198
199sub cf::guard::cancel {
200 ${$_[0]} = sub { };
201}
202
203sub cf::guard::DESTROY {
204 ${$_[0]}->();
205}
206
207=item cf::lock_wait $string 185=item cf::lock_wait $string
208 186
209Wait until the given lock is available. See cf::lock_acquire. 187Wait until the given lock is available. See cf::lock_acquire.
210 188
211=item my $lock = cf::lock_acquire $string 189=item my $lock = cf::lock_acquire $string
212 190
213Wait until the given lock is available and then acquires it and returns 191Wait until the given lock is available and then acquires it and returns
214a guard object. If the guard object gets destroyed (goes out of scope, 192a Coro::guard object. If the guard object gets destroyed (goes out of scope,
215for example when the coroutine gets canceled), the lock is automatically 193for example when the coroutine gets canceled), the lock is automatically
216returned. 194returned.
217 195
218Lock names should begin with a unique identifier (for example, find_map 196Lock names should begin with a unique identifier (for example, cf::map::find
219uses map_find and load_map uses map_load). 197uses map_find and cf::map::load uses map_load).
220 198
221=cut 199=cut
222 200
223our %LOCK; 201our %LOCK;
224 202
… …
238 # wait, to be sure we are not locked 216 # wait, to be sure we are not locked
239 lock_wait $key; 217 lock_wait $key;
240 218
241 $LOCK{$key} = []; 219 $LOCK{$key} = [];
242 220
243 cf::guard { 221 Coro::guard {
244 # wake up all waiters, to be on the safe side 222 # wake up all waiters, to be on the safe side
245 $_->ready for @{ delete $LOCK{$key} }; 223 $_->ready for @{ delete $LOCK{$key} };
246 } 224 }
247} 225}
248 226
227sub freeze_mainloop {
228 return unless $TICK_WATCHER->is_active;
229
230 my $guard = Coro::guard { $TICK_WATCHER->start };
231 $TICK_WATCHER->stop;
232 $guard
233}
234
249=item cf::async { BLOCK } 235=item cf::async { BLOCK }
250 236
251Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the 237Currently the same as Coro::async_pool, meaning you cannot use
252error instead of exiting the server in case of a problem. 238C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
239thing you are allowed to do is call C<prio> on it.
253 240
254=cut 241=cut
255 242
256sub async(&) { 243BEGIN { *async = \&Coro::async_pool }
257 my ($cb) = @_;
258
259 Coro::async {
260 eval { $cb->() };
261 warn $@ if $@;
262 }
263}
264 244
265=item cf::sync_job { BLOCK } 245=item cf::sync_job { BLOCK }
266 246
267The design of crossfire+ requires that the main coro ($Coro::main) is 247The design of crossfire+ requires that the main coro ($Coro::main) is
268always able to handle events or runnable, as crossfire+ is only partly 248always able to handle events or runnable, as crossfire+ is only partly
… …
282 # this is the main coro, too bad, we have to block 262 # this is the main coro, too bad, we have to block
283 # till the operation succeeds, freezing the server :/ 263 # till the operation succeeds, freezing the server :/
284 264
285 # TODO: use suspend/resume instead 265 # TODO: use suspend/resume instead
286 # (but this is cancel-safe) 266 # (but this is cancel-safe)
287 local $FREEZE = 1; 267 my $freeze_guard = freeze_mainloop;
288 268
289 my $busy = 1; 269 my $busy = 1;
290 my @res; 270 my @res;
291 271
292 (Coro::async { 272 (async {
293 @res = eval { $job->() }; 273 @res = eval { $job->() };
294 warn $@ if $@; 274 warn $@ if $@;
295 undef $busy; 275 undef $busy;
296 })->prio (Coro::PRIO_MAX); 276 })->prio (Coro::PRIO_MAX);
297 277
298 while ($busy) { 278 while ($busy) {
299 Coro::cede_notself; 279 Coro::cede or Event::one_event;
300 Event::one_event unless Coro::nready;
301 } 280 }
302 281
303 wantarray ? @res : $res[0] 282 wantarray ? @res : $res[0]
304 } else { 283 } else {
305 # we are in another coroutine, how wonderful, everything just works 284 # we are in another coroutine, how wonderful, everything just works
306 285
307 $job->() 286 $job->()
308 } 287 }
309} 288}
310 289
311=item $coro = cf::coro { BLOCK } 290=item $coro = cf::async_ext { BLOCK }
312 291
313Creates and returns a new coro. This coro is automcatially being canceled 292Like async, but this coro is automcatially being canceled when the
314when the extension calling this is being unloaded. 293extension calling this is being unloaded.
315 294
316=cut 295=cut
317 296
318sub coro(&) { 297sub async_ext(&) {
319 my $cb = shift; 298 my $cb = shift;
320 299
321 my $coro = &cf::async ($cb); 300 my $coro = &Coro::async ($cb);
322 301
323 $coro->on_destroy (sub { 302 $coro->on_destroy (sub {
324 delete $EXT_CORO{$coro+0}; 303 delete $EXT_CORO{$coro+0};
325 }); 304 });
326 $EXT_CORO{$coro+0} = $coro; 305 $EXT_CORO{$coro+0} = $coro;
… …
1093 1072
1094=head2 CORE EXTENSIONS 1073=head2 CORE EXTENSIONS
1095 1074
1096Functions and methods that extend core crossfire objects. 1075Functions and methods that extend core crossfire objects.
1097 1076
1077=cut
1078
1079package cf::player;
1080
1098=head3 cf::player 1081=head3 cf::player
1099 1082
1100=over 4 1083=over 4
1101 1084
1102=item cf::player::exists $login 1085=item cf::player::find $login
1103 1086
1104Returns true when the given account exists. 1087Returns the given player object, loading it if necessary (might block).
1105 1088
1106=cut 1089=cut
1107 1090
1108sub cf::player::exists($) { 1091sub playerdir($) {
1109 cf::player::find $_[0] 1092 cf::localdir
1110 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1093 . "/"
1094 . cf::playerdir
1095 . "/"
1096 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1097}
1098
1099sub path($) {
1100 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1101
1102 (playerdir $login) . "/$login.pl"
1103}
1104
1105sub find_active($) {
1106 $cf::PLAYER{$_[0]}
1107 and $cf::PLAYER{$_[0]}->active
1108 and $cf::PLAYER{$_[0]}
1109}
1110
1111sub exists($) {
1112 my ($login) = @_;
1113
1114 $cf::PLAYER{$login}
1115 or cf::sync_job { !aio_stat $login }
1116}
1117
1118sub find($) {
1119 return $cf::PLAYER{$_[0]} || do {
1120 my $login = $_[0];
1121
1122 my $guard = cf::lock_acquire "user_find:$login";
1123
1124 $cf::PLAYER{$login} ||= (load_pl path $login or return);
1125 };
1126}
1127
1128sub save($) {
1129 my ($pl) = @_;
1130
1131 return if $pl->{deny_save};
1132
1133 my $path = path $pl;
1134 my $guard = cf::lock_acquire "user_save:$path";
1135
1136 return if $pl->{deny_save};
1137
1138 Coro::AIO::aio_mkdir playerdir $pl, 0770;
1139 $pl->{last_save} = $cf::RUNTIME;
1140
1141 $pl->save_pl ($path);
1142 Coro::cede;
1143}
1144
1145sub new($) {
1146 my ($login) = @_;
1147
1148 my $self = create;
1149
1150 $self->ob->name ($login);
1151 $self->{deny_save} = 1;
1152
1153 $cf::PLAYER{$login} = $self;
1154
1155 $self
1156}
1157
1158sub quit_character {
1159 my ($pl) = @_;
1160
1161 $pl->{deny_save} = 1;
1162 $pl->password ("*"); # this should lock out the player until we nuked the dir
1163
1164 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1165 $pl->deactivate;
1166 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1167 $pl->ns->destroy if $pl->ns;
1168
1169 my $path = playerdir $pl;
1170 my $temp = "$path~$cf::RUNTIME~deleting~";
1171 IO::AIO::aio_rename $path, $temp, sub {
1172 delete $cf::PLAYER{$pl->ob->name};
1173 $pl->destroy;
1174
1175 IO::AIO::aio_rmtree $temp;
1176 };
1111} 1177}
1112 1178
1113=item $player->ext_reply ($msgid, $msgtype, %msg) 1179=item $player->ext_reply ($msgid, $msgtype, %msg)
1114 1180
1115Sends an ext reply to the player. 1181Sends an ext reply to the player.
1116 1182
1117=cut 1183=cut
1118 1184
1119sub cf::player::ext_reply($$$%) { 1185sub ext_reply($$$%) {
1120 my ($self, $id, %msg) = @_; 1186 my ($self, $id, %msg) = @_;
1121 1187
1122 $msg{msgid} = $id; 1188 $msg{msgid} = $id;
1123 1189
1124 $self->send ("ext " . to_json \%msg); 1190 $self->send ("ext " . cf::to_json \%msg);
1125} 1191}
1192
1193package cf;
1126 1194
1127=back 1195=back
1128 1196
1129 1197
1130=head3 cf::map 1198=head3 cf::map
… …
1136package cf::map; 1204package cf::map;
1137 1205
1138use Fcntl; 1206use Fcntl;
1139use Coro::AIO; 1207use Coro::AIO;
1140 1208
1141our $MAX_RESET = 7200; 1209our $MAX_RESET = 3600;
1142our $DEFAULT_RESET = 3600; 1210our $DEFAULT_RESET = 3000;
1143 1211
1144sub generate_random_map { 1212sub generate_random_map {
1145 my ($path, $rmp) = @_; 1213 my ($path, $rmp) = @_;
1146 1214
1147 # mit "rum" bekleckern, nicht 1215 # mit "rum" bekleckern, nicht
… …
1177 or return; 1245 or return;
1178 1246
1179 my $map = cf::map::new 1247 my $map = cf::map::new
1180 or return; 1248 or return;
1181 1249
1250 # for better error messages only, will be overwritten
1251 $map->path ($path);
1252
1182 $map->load_header ($path) 1253 $map->load_header ($path)
1183 or return; 1254 or return;
1184 1255
1185 $map->{load_path} = $path; 1256 $map->{load_path} = $path;
1186 1257
1187 $map 1258 $map
1188} 1259}
1189 1260
1190sub find_map; 1261sub find;
1191sub find_map { 1262sub find {
1192 my ($path, $origin) = @_; 1263 my ($path, $origin) = @_;
1193 1264
1194 #warn "find_map<$path,$origin>\n";#d# 1265 #warn "find<$path,$origin>\n";#d#
1195 1266
1196 $path = new cf::path $path, $origin && $origin->path; 1267 $path = new cf::path $path, $origin && $origin->path;
1197 my $key = $path->as_string; 1268 my $key = $path->as_string;
1198 1269
1199 cf::lock_wait "map_find:$key"; 1270 cf::lock_wait "map_find:$key";
… …
1202 my $guard = cf::lock_acquire "map_find:$key"; 1273 my $guard = cf::lock_acquire "map_find:$key";
1203 1274
1204 # do it the slow way 1275 # do it the slow way
1205 my $map = try_load_header $path->save_path; 1276 my $map = try_load_header $path->save_path;
1206 1277
1278 Coro::cede;
1279
1207 if ($map) { 1280 if ($map) {
1281 $map->last_access ((delete $map->{last_access})
1282 || $cf::RUNTIME); #d#
1208 # safety 1283 # safety
1209 $map->{instantiate_time} = $cf::RUNTIME 1284 $map->{instantiate_time} = $cf::RUNTIME
1210 if $map->{instantiate_time} > $cf::RUNTIME; 1285 if $map->{instantiate_time} > $cf::RUNTIME;
1211 } else { 1286 } else {
1212 if (my $rmp = $path->random_map_params) { 1287 if (my $rmp = $path->random_map_params) {
… …
1217 1292
1218 $map or return; 1293 $map or return;
1219 1294
1220 $map->{load_original} = 1; 1295 $map->{load_original} = 1;
1221 $map->{instantiate_time} = $cf::RUNTIME; 1296 $map->{instantiate_time} = $cf::RUNTIME;
1297 $map->last_access ($cf::RUNTIME);
1222 $map->instantiate; 1298 $map->instantiate;
1223 1299
1224 # per-player maps become, after loading, normal maps 1300 # per-player maps become, after loading, normal maps
1225 $map->per_player (0) if $path->{user_rel}; 1301 $map->per_player (0) if $path->{user_rel};
1226 } 1302 }
1227 1303
1228 $map->path ($key); 1304 $map->path ($key);
1229 $map->{path} = $path; 1305 $map->{path} = $path;
1230 $map->{last_save} = $cf::RUNTIME; 1306 $map->{last_save} = $cf::RUNTIME;
1231 $map->last_access ($cf::RUNTIME); 1307
1308 Coro::cede;
1232 1309
1233 if ($map->should_reset) { 1310 if ($map->should_reset) {
1234 $map->reset; 1311 $map->reset;
1235 undef $guard; 1312 undef $guard;
1236 $map = find_map $path 1313 $map = find $path
1237 or return; 1314 or return;
1238 } 1315 }
1239 1316
1240 $cf::MAP{$key} = $map 1317 $cf::MAP{$key} = $map
1241 } 1318 }
… …
1263 if (aio_open $uniq, O_RDONLY, 0) { 1340 if (aio_open $uniq, O_RDONLY, 0) {
1264 $self->clear_unique_items; 1341 $self->clear_unique_items;
1265 $self->load_objects ($uniq, 0); 1342 $self->load_objects ($uniq, 0);
1266 } 1343 }
1267 } 1344 }
1345
1346 Coro::cede;
1268 1347
1269 # now do the right thing for maps 1348 # now do the right thing for maps
1270 $self->link_multipart_objects; 1349 $self->link_multipart_objects;
1271 1350
1272 if ($self->{path}->is_style_map) { 1351 if ($self->{path}->is_style_map) {
… …
1280 $self->difficulty ($self->estimate_difficulty) 1359 $self->difficulty ($self->estimate_difficulty)
1281 unless $self->difficulty; 1360 unless $self->difficulty;
1282 $self->activate; 1361 $self->activate;
1283 } 1362 }
1284 1363
1364 Coro::cede;
1365
1285 $self->in_memory (cf::MAP_IN_MEMORY); 1366 $self->in_memory (cf::MAP_IN_MEMORY);
1286} 1367}
1287 1368
1288sub load_map_sync { 1369sub find_sync {
1289 my ($path, $origin) = @_; 1370 my ($path, $origin) = @_;
1290 1371
1291 #warn "load_map_sync<$path, $origin>\n";#d# 1372 cf::sync_job { cf::map::find $path, $origin }
1373}
1292 1374
1293 cf::sync_job { 1375sub do_load_sync {
1294 my $map = cf::map::find_map $path, $origin 1376 my ($map) = @_;
1295 or return; 1377
1296 $map->load; 1378 cf::sync_job { $map->load };
1297 $map
1298 }
1299} 1379}
1300 1380
1301sub save { 1381sub save {
1302 my ($self) = @_; 1382 my ($self) = @_;
1303 1383
1384 my $lock = cf::lock_acquire "map_data:" . $self->path;
1385
1304 $self->{last_save} = $cf::RUNTIME; 1386 $self->{last_save} = $cf::RUNTIME;
1305 1387
1306 return unless $self->dirty; 1388 return unless $self->dirty;
1307 1389
1308 my $save = $self->{path}->save_path; utf8::encode $save; 1390 my $save = $self->{path}->save_path; utf8::encode $save;
1309 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1391 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1310 1392
1311 $self->{load_path} = $save; 1393 $self->{load_path} = $save;
1312 1394
1313 return if $self->{deny_save}; 1395 return if $self->{deny_save};
1396
1397 local $self->{last_access} = $self->last_access;#d#
1398
1399 cf::async {
1400 $_->contr->save for $self->players;
1401 };
1314 1402
1315 if ($uniq) { 1403 if ($uniq) {
1316 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1404 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1317 $self->save_objects ($uniq, cf::IO_UNIQUES); 1405 $self->save_objects ($uniq, cf::IO_UNIQUES);
1318 } else { 1406 } else {
… …
1324 my ($self) = @_; 1412 my ($self) = @_;
1325 1413
1326 # save first because save cedes 1414 # save first because save cedes
1327 $self->save; 1415 $self->save;
1328 1416
1417 my $lock = cf::lock_acquire "map_data:" . $self->path;
1418
1329 return if $self->players; 1419 return if $self->players;
1330 return if $self->in_memory != cf::MAP_IN_MEMORY; 1420 return if $self->in_memory != cf::MAP_IN_MEMORY;
1331 return if $self->{deny_save}; 1421 return if $self->{deny_save};
1332 1422
1333 $self->clear; 1423 $self->clear;
… …
1375} 1465}
1376 1466
1377sub reset { 1467sub reset {
1378 my ($self) = @_; 1468 my ($self) = @_;
1379 1469
1470 my $lock = cf::lock_acquire "map_data:" . $self->path;
1471
1380 return if $self->players; 1472 return if $self->players;
1381 return if $self->{path}{user_rel};#d# 1473 return if $self->{path}{user_rel};#d#
1382 1474
1383 warn "resetting map ", $self->path;#d# 1475 warn "resetting map ", $self->path;#d#
1384 1476
… …
1403 1495
1404sub customise_for { 1496sub customise_for {
1405 my ($map, $ob) = @_; 1497 my ($map, $ob) = @_;
1406 1498
1407 if ($map->per_player) { 1499 if ($map->per_player) {
1408 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1500 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1409 } 1501 }
1410 1502
1411 $map 1503 $map
1412} 1504}
1413 1505
1414sub emergency_save { 1506sub emergency_save {
1415 local $cf::FREEZE = 1; 1507 my $freeze_guard = cf::freeze_mainloop;
1416 1508
1417 warn "enter emergency map save\n"; 1509 warn "enter emergency perl save\n";
1418 1510
1419 cf::sync_job { 1511 cf::sync_job {
1512 warn "begin emergency player save\n";
1513 $_->save for values %cf::PLAYER;
1514 warn "end emergency player save\n";
1515
1420 warn "begin emergency map save\n"; 1516 warn "begin emergency map save\n";
1421 $_->save for values %cf::MAP; 1517 $_->save for values %cf::MAP;
1518 warn "end emergency map save\n";
1422 }; 1519 };
1423 1520
1424 warn "end emergency map save\n"; 1521 warn "leave emergency perl save\n";
1425} 1522}
1426 1523
1427package cf; 1524package cf;
1428 1525
1429=back 1526=back
… …
1510 my $link_pos = delete $self->{_link_pos}; 1607 my $link_pos = delete $self->{_link_pos};
1511 1608
1512 unless ($map) { 1609 unless ($map) {
1513 # restore original map position 1610 # restore original map position
1514 ($map, $x, $y) = @{ $link_pos || [] }; 1611 ($map, $x, $y) = @{ $link_pos || [] };
1515 $map = cf::map::find_map $map; 1612 $map = cf::map::find $map;
1516 1613
1517 unless ($map) { 1614 unless ($map) {
1518 ($map, $x, $y) = @$EMERGENCY_POSITION; 1615 ($map, $x, $y) = @$EMERGENCY_POSITION;
1519 $map = cf::map::find_map $map 1616 $map = cf::map::find $map
1520 or die "FATAL: cannot load emergency map\n"; 1617 or die "FATAL: cannot load emergency map\n";
1521 } 1618 }
1522 } 1619 }
1523 1620
1524 ($x, $y) = (-1, -1) 1621 ($x, $y) = (-1, -1)
… …
1528 ($x, $y) = ($map->enter_x, $map->enter_y) 1625 ($x, $y) = ($map->enter_x, $map->enter_y)
1529 if $x <=0 && $y <= 0; 1626 if $x <=0 && $y <= 0;
1530 1627
1531 $map->load; 1628 $map->load;
1532 1629
1630 return unless $self->contr->active;
1533 $self->activate_recursive; 1631 $self->activate_recursive;
1534 $self->enter_map ($map, $x, $y); 1632 $self->enter_map ($map, $x, $y);
1535} 1633}
1536 1634
1537cf::player->attach ( 1635cf::player->attach (
… …
1550 1648
1551 # try to abort aborted map switching on player login :) 1649 # try to abort aborted map switching on player login :)
1552 # should happen only on crashes 1650 # should happen only on crashes
1553 if ($pl->ob->{_link_pos}) { 1651 if ($pl->ob->{_link_pos}) {
1554 $pl->ob->enter_link; 1652 $pl->ob->enter_link;
1555 cf::async { 1653 (async {
1556 # we need this sleep as the login has a concurrent enter_exit running 1654 # we need this sleep as the login has a concurrent enter_exit running
1557 # and this sleep increases chances of the player not ending up in scorn 1655 # and this sleep increases chances of the player not ending up in scorn
1656 $pl->ob->reply (undef,
1657 "There was an internal problem at your last logout, "
1658 . "the server will try to bring you to your intended destination in a second.",
1659 cf::NDI_RED);
1558 Coro::Timer::sleep 1; 1660 Coro::Timer::sleep 1;
1559 $pl->ob->leave_link; 1661 $pl->ob->leave_link;
1560 }; 1662 })->prio (2);
1561 } 1663 }
1562 }, 1664 },
1563); 1665);
1564 1666
1565=item $player_object->goto_map ($path, $x, $y) 1667=item $player_object->goto ($path, $x, $y)
1566 1668
1567=cut 1669=cut
1568 1670
1569sub cf::object::player::goto_map { 1671sub cf::object::player::goto {
1570 my ($self, $path, $x, $y) = @_; 1672 my ($self, $path, $x, $y) = @_;
1571 1673
1572 $self->enter_link; 1674 $self->enter_link;
1573 1675
1574 (cf::async { 1676 (async {
1575 $path = new cf::path $path; 1677 $path = new cf::path $path;
1576 1678
1577 my $map = cf::map::find_map $path->as_string; 1679 my $map = cf::map::find $path->as_string;
1578 $map = $map->customise_for ($self) if $map; 1680 $map = $map->customise_for ($self) if $map;
1579 1681
1580# warn "entering ", $map->path, " at ($x, $y)\n" 1682# warn "entering ", $map->path, " at ($x, $y)\n"
1581# if $map; 1683# if $map;
1582 1684
… …
1641 1743
1642 return unless $self->type == cf::PLAYER; 1744 return unless $self->type == cf::PLAYER;
1643 1745
1644 $self->enter_link; 1746 $self->enter_link;
1645 1747
1646 (cf::async { 1748 (async {
1749 $self->deactivate_recursive; # just to be sure
1647 unless (eval { 1750 unless (eval {
1648 prepare_random_map $exit 1751 prepare_random_map $exit
1649 if $exit->slaying eq "/!"; 1752 if $exit->slaying eq "/!";
1650 1753
1651 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1754 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1652 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1755 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1653 1756
1654 1; 1757 1;
1655 }) { 1758 }) {
1656 $self->message ("Something went wrong deep within the crossfire server. " 1759 $self->message ("Something went wrong deep within the crossfire server. "
1657 . "I'll try to bring you back to the map you were before. " 1760 . "I'll try to bring you back to the map you were before. "
… …
1731 } 1834 }
1732 } 1835 }
1733 }, 1836 },
1734); 1837);
1735 1838
1736=item $client->coro (\&cb) 1839=item $client->async (\&cb)
1737 1840
1738Create a new coroutine, running the specified callback. The coroutine will 1841Create a new coroutine, running the specified callback. The coroutine will
1739be automatically cancelled when the client gets destroyed (e.g. on logout, 1842be automatically cancelled when the client gets destroyed (e.g. on logout,
1740or loss of connection). 1843or loss of connection).
1741 1844
1742=cut 1845=cut
1743 1846
1744sub cf::client::coro { 1847sub cf::client::async {
1745 my ($self, $cb) = @_; 1848 my ($self, $cb) = @_;
1746 1849
1747 my $coro = &cf::async ($cb); 1850 my $coro = &Coro::async ($cb);
1748 1851
1749 $coro->on_destroy (sub { 1852 $coro->on_destroy (sub {
1750 delete $self->{_coro}{$coro+0}; 1853 delete $self->{_coro}{$coro+0};
1751 }); 1854 });
1752 1855
… …
1990 local $/; 2093 local $/;
1991 *CFG = YAML::Syck::Load <$fh>; 2094 *CFG = YAML::Syck::Load <$fh>;
1992 2095
1993 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2096 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1994 2097
2098 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2099 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2100
1995 if (exists $CFG{mlockall}) { 2101 if (exists $CFG{mlockall}) {
1996 eval { 2102 eval {
1997 $CFG{mlockall} ? &mlockall : &munlockall 2103 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
1998 and die "WARNING: m(un)lockall failed: $!\n"; 2104 and die "WARNING: m(un)lockall failed: $!\n";
1999 }; 2105 };
2000 warn $@ if $@; 2106 warn $@ if $@;
2001 } 2107 }
2002} 2108}
2003 2109
2004sub main { 2110sub main {
2005 # we must not ever block the main coroutine 2111 # we must not ever block the main coroutine
2006 local $Coro::idle = sub { 2112 local $Coro::idle = sub {
2007 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2113 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2008 (Coro::unblock_sub {
2009 Event::one_event; 2114 async { Event::one_event };
2010 })->();
2011 }; 2115 };
2012 2116
2013 cfg_load; 2117 cfg_load;
2014 db_load; 2118 db_load;
2015 load_extensions; 2119 load_extensions;
… …
2026 return; 2130 return;
2027 } 2131 }
2028 2132
2029 warn "reloading..."; 2133 warn "reloading...";
2030 2134
2031 local $FREEZE = 1; 2135 my $guard = freeze_mainloop;
2032 cf::emergency_save; 2136 cf::emergency_save;
2033 2137
2034 eval { 2138 eval {
2035 # if anything goes wrong in here, we should simply crash as we already saved 2139 # if anything goes wrong in here, we should simply crash as we already saved
2036 2140
… …
2098 cf::load_extensions; 2202 cf::load_extensions;
2099 2203
2100 # reattach attachments to objects 2204 # reattach attachments to objects
2101 warn "reattach"; 2205 warn "reattach";
2102 _global_reattach; 2206 _global_reattach;
2207 reattach $_ for values %MAP;
2103 }; 2208 };
2104 2209
2105 if ($@) { 2210 if ($@) {
2106 warn $@; 2211 warn $@;
2107 warn "error while reloading, exiting."; 2212 warn "error while reloading, exiting.";
… …
2123 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2228 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2124 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2229 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2125 2230
2126 # dirty hack because... archetypes are not yet loaded 2231 # dirty hack because... archetypes are not yet loaded
2127 Event->timer ( 2232 Event->timer (
2128 after => 2, 2233 after => 10,
2129 cb => sub { 2234 cb => sub {
2130 $_[0]->w->cancel; 2235 $_[0]->w->cancel;
2131 2236
2132 # provide some exits "home" 2237 # provide some exits "home"
2133 my $exit = cf::object::new "exit"; 2238 my $exit = cf::object::new "exit";
… …
2172 reentrant => 0, 2277 reentrant => 0,
2173 prio => 0, 2278 prio => 0,
2174 at => $NEXT_TICK || $TICK, 2279 at => $NEXT_TICK || $TICK,
2175 data => WF_AUTOCANCEL, 2280 data => WF_AUTOCANCEL,
2176 cb => sub { 2281 cb => sub {
2177 unless ($FREEZE) {
2178 cf::server_tick; # one server iteration 2282 cf::server_tick; # one server iteration
2179 $RUNTIME += $TICK; 2283 $RUNTIME += $TICK;
2180 }
2181
2182 $NEXT_TICK += $TICK; 2284 $NEXT_TICK += $TICK;
2183 2285
2184 # if we are delayed by four ticks or more, skip them all 2286 # if we are delayed by four ticks or more, skip them all
2185 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2287 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2186 2288

Diff Legend

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